Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 026887b8e7e2f77f49461c30bd11f04591e8538c..aeb37a07e21dab19f05e7b6eb81193de7936cc63 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,10 +3,10 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-TMPLFILES = afp.conf.tmpl
-GENFILES = afp.conf
+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 netatalk-dbus.conf tracker.cfg
+EXTRA_DIST = $(TMPLFILES) extmap.conf netatalk-dbus.conf
 
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
@@ -28,6 +28,7 @@ endif
            -e s@:ETCDIR:@${pkgconfdir}@ \
            -e s@:COMPILED_BACKENDS:@"$(compiled_backends)"@ \
            -e s@:DEFAULT_CNID_SCHEME:@$(DEFAULT_CNID_SCHEME)@ \
+               -e s@:LOCALSTATEDIR:@"$(localstatedir)"@ \
            <$< >$@
 
 #
@@ -48,9 +49,6 @@ uninstall-local:
        rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf
        rm -f $(DESTDIR)$(localstatedir)/netatalk/README
        rm -f $(DESTDIR)$(localstatedir)/netatalk/CNID/README
-if HAVE_TRACKER_RDF
-       rm -f $(DESTDIR)$(pkgconfdir)/tracker/tracker.cfg
-endif
 if USE_DEBIAN
        rm -f $(DESTDIR)/etc/default/netatalk
 endif
@@ -74,11 +72,3 @@ install-config-files: $(CONFFILES) $(GENFILES)
                        echo "not overwriting $$f"; \
                fi; \
        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) $(srcdir)/tracker.cfg $(DESTDIR)$(pkgconfdir)/tracker/ ; \
-       fi
-endif