Forward-Ports from the stabilizing branch.

[netatalk.git] / config / Makefile.am

diff --git a/config/Makefile.am b/config/Makefile.am
index 02e538c1ee70c023fef919a971446d0ff4fb8c44..8082726722a1bbf7bfdd222c1ef236594c8a82c2 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -5,15 +5,15 @@ SUFFIXES = .tmpl .
 GENFILES = afpd.conf
 TMPLFILES = $(foreach file,$(GENFILES),$(file).tmpl)
 CONFFILES = AppleVolumes.default AppleVolumes.system \
-       atalkd.conf netatalk.conf netatalk.pamd papd.conf
+       atalkd.conf netatalk.conf papd.conf
 PAMFILES = netatalk.pamd
+OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
 EXTRA_DIST = $(CONFFILES) $(TMPLFILES) $(PAMFILES)
 
-CLEANFILES += $(GENFILES)
+CLEANFILES = $(GENFILES)
 
 pkgconfdir = @PKGCONFDIR@
-pkgconf_DATA = $(CONFFILES) $(GENFILES)
 
 #
 # rule to parse template files
@@ -23,7 +23,22 @@ pkgconf_DATA = $(CONFFILES) $(GENFILES)
        sed -e s@:UAMS_PATH:@${UAMS_PATH}@ \
            -e s@:NLS_PATH:@${pkgconfdir}/nls@ \
            -e s@:ETCDIR:@${pkgconfdir}@ \
-           <$^ >$@
+           <$< >$@
+
+#
+# install configuration files
+#
+
+install-config-files: $(CONFFILES) $(GENFILES)
+       $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
+       for f in $(CONFFILES) $(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); \
+               else \
+                       echo "not overwriting $$f"; \
+               fi; \
+       done
 
 #
 # pluggable authentication modules support
@@ -31,9 +46,16 @@ pkgconf_DATA = $(CONFFILES) $(GENFILES)
 
 if USE_PAM
 
-pamdir   = $(sysconfdir)/pam.d
+pamdir = @PAMDIR@/etc/pam.d
+
+install-data-local: install-config-files $(PAMFILES)
+       $(mkinstalldirs) $(DESTDIR)$(pamdir)
+       for f in $(PAMFILES); do \
+               $(INSTALL_DATA) $$f $(DESTDIR)$(pamdir)/netatalk; \
+       done
+
+else
 
-install-data-local:
-       $(INSTALL_DATA) netatalk.pamd $(DESTDIR)$(pamdir)/netatalk
+install-data-local: install-config-files
 
 endif