From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 2 Mar 2011 09:22:17 +0000 (+0100)
Subject: Merge 2-1
X-Git-Url: https://arthur.barton.de/gitweb/?a=commitdiff_plain;h=18964cebf514f78defd3df1cfed91e34d99cfa28;hp=dc2cc97f6b11c7707ee255ddb104b296dd6c3e63;p=netatalk.git

Merge 2-1
---

diff --git a/config/Makefile.am b/config/Makefile.am
index 4817238a..8fbfddeb 100644
--- 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 53337c78..6d7e51a4 100644
--- 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