X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=config%2FMakefile.am;h=026887b8e7e2f77f49461c30bd11f04591e8538c;hb=48af5314c0219b42d13057d907e6837de437a015;hp=d7a0906e02c46e03b3025c19cbfe2059fa2eea67;hpb=ae882d2dd45116ab9e0af8a50cbb9a6d2409fd47;p=netatalk.git

diff --git a/config/Makefile.am b/config/Makefile.am
index d7a0906e..026887b8 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,16 +3,22 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-TMPLFILES = afp.conf.tmpl dbus-session.conf.tmpl
-GENFILES = afp.conf dbus-session.conf
+TMPLFILES = afp.conf.tmpl
+GENFILES = afp.conf
 CLEANFILES = $(GENFILES)
-EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf.tmpl
+EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf netatalk-dbus.conf tracker.cfg
 
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
 CONFFILES = extmap.conf
 
 pkgconfdir = @PKGCONFDIR@
+
+if HAVE_DBUS_GLIB
+dbusservicedir = $(DBUS_SYS_DIR)
+dbusservice_DATA = netatalk-dbus.conf
+endif
+
 #
 # rule to parse template files
 #
@@ -35,10 +41,11 @@ install-data-local: install-config-files
 	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/
 
 uninstall-local:
-	for f in $(CONFFILES) $(GENFILES); do \
+	@for f in $(CONFFILES) $(GENFILES); do \
 		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
 		rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
 	done
+	rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf
 	rm -f $(DESTDIR)$(localstatedir)/netatalk/README
 	rm -f $(DESTDIR)$(localstatedir)/netatalk/CNID/README
 if HAVE_TRACKER_RDF
@@ -50,7 +57,8 @@ endif
 
 install-config-files: $(CONFFILES) $(GENFILES)
 	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
-	for f in $(CONFFILES) ; do \
+	$(INSTALL_DATA) $(srcdir)/dbus-session.conf $(DESTDIR)$(pkgconfdir)
+	@for f in $(CONFFILES) ; do \
 		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
 			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
 			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgconfdir); \
@@ -58,7 +66,7 @@ install-config-files: $(CONFFILES) $(GENFILES)
 			echo "not overwriting $$f"; \
 		fi; \
 	done
-	for f in $(GENFILES); do \
+	@for f in $(GENFILES); do \
 		if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
 			echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
 			$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \
@@ -71,6 +79,6 @@ if HAVE_TRACKER_RDF
 		if test ! -d $(DESTDIR)$(pkgconfdir)/tracker ; then \
 			mkdir $(DESTDIR)$(pkgconfdir)/tracker ; \
 		fi ; \
-		$(INSTALL_DATA) tracker.cfg $(DESTDIR)$(pkgconfdir)/tracker/ ; \
+		$(INSTALL_DATA) $(srcdir)/tracker.cfg $(DESTDIR)$(pkgconfdir)/tracker/ ; \
 	fi
 endif