X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=config%2FMakefile.am;h=4763046063a2ce5cd491e74dd8f0c46a831fa96c;hb=5e3c97674fb2cae8a18499377f0e92ea75751c8f;hp=39f797395f4ad9ff4abef67b4a2be4ae9870dc43;hpb=72ec12b0e0798bb7e22dd5526fdccfad8fcb0fc0;p=netatalk.git

diff --git a/config/Makefile.am b/config/Makefile.am
index 39f79739..47630460 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,14 +3,14 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-TMPLFILES = 
-GENFILES = 
+TMPLFILES = afp.conf.tmpl
+GENFILES = afp.conf
 CLEANFILES = $(GENFILES)
-EXTRA_DIST = afp.conf
+EXTRA_DIST = afp.conf.tmpl
 
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
-CONFFILES = afp.conf
+CONFFILES = 
 
 pkgconfdir = @PKGCONFDIR@
 #
@@ -31,21 +31,31 @@ pkgconfdir = @PKGCONFDIR@
 install-data-local: install-config-files
 	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/
 	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/
-	$(INSTALL_DATA) README $(DESTDIR)$(localstatedir)/netatalk/
-	$(INSTALL_DATA) README $(DESTDIR)$(localstatedir)/netatalk/CNID/
+	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/
+	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/
 
 uninstall-local:
 	for f in $(CONFFILES) $(GENFILES); do \
 		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
 		rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
 	done
+	rm -f $(DESTDIR)$(localstatedir)/netatalk/README
+	rm -f $(DESTDIR)$(localstatedir)/netatalk/CNID/README
 if USE_DEBIAN
 	rm -f $(DESTDIR)/etc/default/netatalk
 endif
 
 install-config-files: $(CONFFILES) $(GENFILES)
 	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
-	for f in $(CONFFILES) $(GENFILES); do \
+	for f in $(CONFFILES) ; do \
+		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
+			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
+			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgconfdir); \
+		else \
+			echo "not overwriting $$f"; \
+		fi; \
+	done
+	for f in $(GENFILES); do \
 		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
 			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
 			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \