From: Frank Lahm <franklahm@googlemail.com>
Date: Sat, 24 Mar 2012 07:12:54 +0000 (+0100)
Subject: Merge remote branch 'sf/branch-allea' into branch-allea
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=5e3c97674fb2cae8a18499377f0e92ea75751c8f;hp=e8f25eeedb4984a723ee3689f4bf5a5fbf9ee01a

Merge remote branch 'sf/branch-allea' into branch-allea
---

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); \
diff --git a/config/afp.conf b/config/afp.conf
deleted file mode 100644
index a70b1b3e..00000000
--- a/config/afp.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-;
-; Netatalk 3.x configuration file
-;
-
-[Global]
-; Global server settings
-
-    unix charset = UTF8
-    vol charset = UTF8
-    mac charset = MAC_ROMAN
-
-
-; [My AFP Volume]
-;
-; path = /path/to/volume
diff --git a/config/afp.conf.tmpl b/config/afp.conf.tmpl
new file mode 100644
index 00000000..a70b1b3e
--- /dev/null
+++ b/config/afp.conf.tmpl
@@ -0,0 +1,15 @@
+;
+; Netatalk 3.x configuration file
+;
+
+[Global]
+; Global server settings
+
+    unix charset = UTF8
+    vol charset = UTF8
+    mac charset = MAC_ROMAN
+
+
+; [My AFP Volume]
+;
+; path = /path/to/volume