* docs/MAIL.FILTERING: added note on removing procmail -f or

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index c2645cb..66e42ad 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -23,6 +23,7 @@ smtpservers = @smtpservers@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_DATA    = @INSTALL_DATA@
 
 # Path to search for programs to handle MIME
@@ -48,18 +49,14 @@ STATIC_FILES =  MailAliases components digestcomps distcomps forwcomps      \
 # templates and scripts from which non-static files are generated
 GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh mts.conf.in sendfiles.in
 
-# scripts generated using above GENERATED_FILE_SRCs
+# scripts generated using above GENERATED_FILE_SRCs; don't add binaries
+# to this list, as they'll get installed with INSTALL_SCRIPT and won't
+# be stripped.
 GENERATED_BIN_FILES = sendfiles
 
 # non-scripts generated using above GENERATED_FILE_SRCs
 GENERATED_ETC_FILES = mhn.defaults mts.conf
 
-# scripts we need to install (in bin)
-INSTALL_BIN_FILES = $(GENERATED_BIN_FILES)
-
-# non-scripts we need to install (in etc)
-INSTALL_ETC_FILES = $(STATIC_FILES) $(GENERATED_ETC_FILES)
-
 # auxiliary files (included in distribution but not installed)
 AUX = Makefile.in
 
@@ -89,34 +86,48 @@ sendfiles: $(srcdir)/sendfiles.in Makefile
 install: install-bin-files install-etc-files
 
 install-bin-files:
-       $(top_srcdir)/mkinstalldirs $(bindir)
-       for script in $(INSTALL_BIN_FILES); do \
-         $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+       for script in $(GENERATED_BIN_FILES); do \
+         $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
        done
 
 install-etc-files:
-       $(top_srcdir)/mkinstalldirs $(etcdir)
-       for file in $(INSTALL_ETC_FILES); do \
-         echo $$file; \
-         if [ -f $(etcdir)/$$file ]; then \
-           mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
-         fi; \
-         $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-         if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
-           rm $(etcdir)/$$file.prev; \
+       $(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
+       INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
+       for file in $(STATIC_FILES); do \
+         INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
+       done; \
+       for path in $$INSTALL_FILES; do \
+         file=`basename $$path`; \
+         echo "Installing $$file..."; \
+         if [ -f $(DESTDIR)$(etcdir)/$$file ]; then \
+           mv $(DESTDIR)$(etcdir)/$$file $(DESTDIR)$(etcdir)/$$file.prev; \
+           $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
+           if diff $(DESTDIR)$(etcdir)/$$file.prev $(DESTDIR)$(etcdir)/$$file; then \
+             rm $(DESTDIR)$(etcdir)/$$file.prev; \
+           else \
+             echo; \
+             echo "  Previous version of $$file saved as $$file.prev due\c";\
+             echo   " to diffs."; \
+             echo "  Please merge any local config changes into the new\c"; \
+             echo   " $$file."; \
+             echo; \
+           fi; \
+         else \
+           $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
          fi; \
        done
 
 uninstall: uninstall-bin-files uninstall-etc-files
 
 uninstall-bin-files:
-       for script in $(INSTALL_BIN_FILES); do \
-         rm -f $(bindir)/$$script; \
+       for script in $(GENERATED_BIN_FILES); do \
+         rm -f $(DESTDIR)$(bindir)/$$script; \
        done
 
 uninstall-etc-files:
-       for file in $(INSTALL_ETC_FILES); do \
-         rm -f $(etcdir)/$$file; \
+       for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
+         rm -f $(DESTDIR)$(etcdir)/$$file; \
        done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -139,7 +150,7 @@ superclean: realclean
 subdir = etc
 
 Makefile: Makefile.in ../config.status
-       cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+       cd .. && ./config.status $(subdir)/$@
  
 distdir = ../`cat ../distname`/$(subdir)
 nmhdist: $(DIST)