Merge branch-2-1

diff --cc config/Makefile.am
index c0015baed933d5bd81d14cd985c9d20c84ae7b61,1c3699a50c0d4635086890985e5d6a36459ed5ab..001affa9ca0a6f15732bb0621741e2a3eec2817a
--- 1/config/Makefile.am
--- 2/config/Makefile.am
+++ b/config/Makefile.am
@@@ -69,16 -64,17 +68,26 @@@ install-config-files: $(CONFFILES) $(GE
                        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
+       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 \