Merge 2-1

diff --git a/config/Makefile.am b/config/Makefile.am
index 4817238a3be6ea7ab06907787dcfebe7bedff6d2..8fbfddebf416965b02241f71329d9c92e8fe1950 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -60,9 +60,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)
@@ -78,21 +77,11 @@ install-config-files: $(CONFFILES) $(GENFILES)
 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; \
+               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;
-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;
+       fi
 endif
 
 install-webmin:

diff --git a/include/atalk/adouble.h b/include/atalk/adouble.h
index 53337c789f113a27c25c6c3436affedc89b4019e..6d7e51a4e27f452f696001c3adc40854ebc37715 100644 (file)
--- a/include/atalk/adouble.h
+++ b/include/atalk/adouble.h
@@ -76,7 +76,10 @@
 #include <fcntl.h>
 #endif
 
+#ifdef USE_MMAPPED_HEADERS
 #include <sys/mman.h>
+#endif
+
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif