X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=config%2FMakefile.am;h=aeb37a07e21dab19f05e7b6eb81193de7936cc63;hb=4021b76ce3f3e51756e9d59b4a5a045ad6398dc8;hp=272087aa502cccfc54b69024a3640fd14a416243;hpb=0c1ba66ff94ef48f89963947407d4a3defb8da79;p=netatalk.git

diff --git a/config/Makefile.am b/config/Makefile.am
index 272087aa..aeb37a07 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,16 +3,22 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-TMPLFILES = 
-GENFILES = 
+TMPLFILES = afp.conf.tmpl dbus-session.conf.tmpl
+GENFILES = afp.conf dbus-session.conf
 CLEANFILES = $(GENFILES)
-EXTRA_DIST = afp.conf
+EXTRA_DIST = $(TMPLFILES) extmap.conf netatalk-dbus.conf
 
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
-CONFFILES = afp.conf
+CONFFILES = extmap.conf
 
 pkgconfdir = @PKGCONFDIR@
+
+if HAVE_DBUS_GLIB
+dbusservicedir = $(DBUS_SYS_DIR)
+dbusservice_DATA = netatalk-dbus.conf
+endif
+
 #
 # rule to parse template files
 #
@@ -22,6 +28,7 @@ pkgconfdir = @PKGCONFDIR@
 	    -e s@:ETCDIR:@${pkgconfdir}@ \
 	    -e s@:COMPILED_BACKENDS:@"$(compiled_backends)"@ \
 	    -e s@:DEFAULT_CNID_SCHEME:@$(DEFAULT_CNID_SCHEME)@ \
+		-e s@:LOCALSTATEDIR:@"$(localstatedir)"@ \
 	    <$< >$@
 
 #
@@ -30,20 +37,34 @@ pkgconfdir = @PKGCONFDIR@
 
 install-data-local: install-config-files
 	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/
-	$(INSTALL_DATA) README $(DESTDIR)$(localstatedir)/netatalk/
+	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/
+	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/
+	$(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 USE_DEBIAN
 	rm -f $(DESTDIR)/etc/default/netatalk
 endif
 
 install-config-files: $(CONFFILES) $(GENFILES)
 	$(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
-	for f in $(CONFFILES) $(GENFILES); 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); \
+		else \
+			echo "not overwriting $$f"; \
+		fi; \
+	done
+	@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); \