make distcheck fixes

diff --git a/config/Makefile.am b/config/Makefile.am
index 39f797395f4ad9ff4abef67b4a2be4ae9870dc43..4763046063a2ce5cd491e74dd8f0c46a831fa96c 100644 (file)
--- 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 (file)
index a70b1b3..0000000
--- 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 (file)
index 0000000..a70b1b3
--- /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