Merge from branch-2-1

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index c0015baed933d5bd81d14cd985c9d20c84ae7b61..4817238a3be6ea7ab06907787dcfebe7bedff6d2 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,8 +3,19 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-GENFILES = afpd.conf AppleVolumes.default
 TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
+GENFILES = afpd.conf AppleVolumes.default
+CLEANFILES = $(GENFILES)
+EXTRA_DIST = \
+       AppleVolumes.default.tmpl \
+       AppleVolumes.system \
+       afp_ldap.conf \
+       afpd.conf.tmpl \
+       atalkd.conf \
+       netatalk.conf \
+       papd.conf
+
+OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
 if USE_DEBIAN
 CONFFILES = AppleVolumes.system
@@ -20,10 +31,6 @@ if USE_APPLETALK
 CONFFILES += atalkd.conf papd.conf
 endif
 
-OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
-EXTRA_DIST = $(CONFFILES) $(TMPLFILES) afp_ldap.conf
-CLEANFILES = $(GENFILES)
-
 pkgconfdir = @PKGCONFDIR@
 webminpath = @WEBMIN_PATH@
 webminuser = @WEBMIN_USER@
@@ -58,7 +65,6 @@ if USE_DEBIAN
        rm -f $(DESTDIR)/etc/default/netatalk;
 endif
 
-
 install-config-files: $(CONFFILES) $(GENFILES)
        $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
        for f in $(CONFFILES) $(GENFILES); do \
@@ -79,6 +85,16 @@ if USE_DEBIAN
        fi;
 endif
 
+if USE_DEBIAN
+       $(mkinstalldirs) $(DESTDIR)/default
+       if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f /etc/default/netatalk; then \
+               echo "$(INSTALL_DATA) netatalk.conf $(DESTDIR)/etc/default/netatalk"; \
+               $(INSTALL_DATA) netatalk.conf $(DESTDIR)/etc/default/netatalk; \
+       else \
+               echo "not overwriting /etc/default/netatalk"; \
+       fi;
+endif
+
 install-webmin:
        if test "x$(webminpath)" != "x"; then \
                if ! test -d "x$(webminpath)"; then \