Merge branch-2-1

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 1c3699a50c0d4635086890985e5d6a36459ed5ab..001affa9ca0a6f15732bb0621741e2a3eec2817a 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -7,15 +7,19 @@ GENFILES = afpd.conf AppleVolumes.default
 TMPLFILES = afpd.conf.tmpl AppleVolumes.default.tmpl
 
 if USE_DEBIAN
-CONFFILES = AppleVolumes.system atalkd.conf papd.conf
+CONFFILES = AppleVolumes.system
 else
-CONFFILES = AppleVolumes.system atalkd.conf papd.conf netatalk.conf
+CONFFILES = AppleVolumes.system netatalk.conf
 endif
 
-if USE_NFSv4_ACLS
+if HAVE_ACLS
 CONFFILES += afp_ldap.conf
 endif
 
+if USE_APPLETALK
+CONFFILES += atalkd.conf papd.conf
+endif
+
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 EXTRA_DIST = $(CONFFILES) $(TMPLFILES) afp_ldap.conf
 CLEANFILES = $(GENFILES)
@@ -64,6 +68,15 @@ install-config-files: $(CONFFILES) $(GENFILES)
                        echo "not overwriting $$f"; \
                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
 
 if USE_DEBIAN
        $(mkinstalldirs) $(DESTDIR)/default