Merge branch-2-1

diff --git a/config/Makefile.am b/config/Makefile.am
index 8fbfddebf416965b02241f71329d9c92e8fe1950..ce0fb96e2d3c02f02620a88f843082299a31d6c6 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -75,7 +75,7 @@ install-config-files: $(CONFFILES) $(GENFILES)
                fi; \
        done
 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) $(srcdir)/netatalk.conf $(DESTDIR)/etc/default/netatalk"; \
                $(INSTALL_DATA) $(srcdir)/netatalk.conf $(DESTDIR)/etc/default/netatalk; \