Merge remote-tracking branch 'origin/develop' into spotlight

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 1e2e6d3500e11d9686b48f8afa22292697ea213a..3fd2872c160ffda0b0066e385f006480369852d9 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -6,13 +6,19 @@ SUFFIXES = .tmpl .
 TMPLFILES = afp.conf.tmpl dbus-session.conf.tmpl
 GENFILES = afp.conf dbus-session.conf
 CLEANFILES = $(GENFILES)
-EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf.tmpl
+EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf.tmpl netatalk-dbus.conf
 
 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
 #
@@ -68,6 +74,9 @@ install-config-files: $(CONFFILES) $(GENFILES)
        done
 if HAVE_TRACKER_RDF
        if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/tracker/tracker.cfg ; then \
+               if test ! -d $(DESTDIR)$(pkgconfdir)/tracker ; then \
+                       mkdir $(DESTDIR)$(pkgconfdir)/tracker ; \
+               fi ; \
                $(INSTALL_DATA) tracker.cfg $(DESTDIR)$(pkgconfdir)/tracker/ ; \
        fi
 endif