Merge master

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 4817238a3be6ea7ab06907787dcfebe7bedff6d2..bd503aebb8a407065ae8ea8d4964be4f26a5fc9d 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -11,9 +11,7 @@ EXTRA_DIST = \
        AppleVolumes.system \
        afp_ldap.conf \
        afpd.conf.tmpl \
-       atalkd.conf \
-       netatalk.conf \
-       papd.conf
+       netatalk.conf
 
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
@@ -27,10 +25,6 @@ if HAVE_ACLS
 CONFFILES += afp_ldap.conf
 endif
 
-if USE_APPLETALK
-CONFFILES += atalkd.conf papd.conf
-endif
-
 pkgconfdir = @PKGCONFDIR@
 webminpath = @WEBMIN_PATH@
 webminuser = @WEBMIN_USER@
@@ -60,9 +54,8 @@ uninstall-local:
                echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
                rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
        done
-
 if USE_DEBIAN
-       rm -f $(DESTDIR)/etc/default/netatalk;
+       rm -f $(DESTDIR)/etc/default/netatalk
 endif
 
 install-config-files: $(CONFFILES) $(GENFILES)
@@ -76,23 +69,13 @@ 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
-
-if USE_DEBIAN
-       $(mkinstalldirs) $(DESTDIR)/default
+       $(mkinstalldirs) $(DESTDIR)/etc/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; \
+               echo "$(INSTALL_DATA) $(srcdir)/netatalk.conf $(DESTDIR)/etc/default/netatalk"; \
+               $(INSTALL_DATA) $(srcdir)/netatalk.conf $(DESTDIR)/etc/default/netatalk; \
        else \
                echo "not overwriting /etc/default/netatalk"; \
-       fi;
+       fi
 endif
 
 install-webmin: