debian's conf file path is /etc/default/netatalk (merge 6a940f1ea5aef6e86f50a0eed2fca...

diff --git a/config/Makefile.am b/config/Makefile.am
index ab07e1134ffb7822389652be30c4cf3d36f2cabe..1c3699a50c0d4635086890985e5d6a36459ed5ab 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -5,7 +5,13 @@ SUFFIXES = .tmpl .
 
 GENFILES = afpd.conf AppleVolumes.default
 TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
-CONFFILES = AppleVolumes.system atalkd.conf netatalk.conf papd.conf
+
+if USE_DEBIAN
+CONFFILES = AppleVolumes.system atalkd.conf papd.conf
+else
+CONFFILES = AppleVolumes.system atalkd.conf papd.conf netatalk.conf
+endif
+
 if USE_NFSv4_ACLS
 CONFFILES += afp_ldap.conf
 endif
@@ -44,6 +50,9 @@ uninstall-local:
                rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
        done
 
+if USE_DEBIAN
+       rm -f $(DESTDIR)/etc/default/netatalk;
+endif
 
 install-config-files: $(CONFFILES) $(GENFILES)
        $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
@@ -56,6 +65,16 @@ install-config-files: $(CONFFILES) $(GENFILES)
                fi; \
        done
 
+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 \