X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=0c7736d646151179600dbdf37f4fb9d4573ca6cd;hp=d50fcf78864e40f88c9d1a78a771897be2163a85;hb=2abae0bfd0ad5bf898461e50aa4b466d641f23d9;hpb=20e97363e4c0e84b3744f3642e7d350fa8916e32

diff --git a/etc/Makefile.in b/etc/Makefile.in
index d50fcf7..0c7736d 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for etc subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -16,13 +14,11 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-MTS         = @MTS@
 mailspool   = @mailspool@
-masquerade  = @masquerade@
-smtpservers = @smtpservers@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
 INSTALL_DATA    = @INSTALL_DATA@
 
 # Path to search for programs to handle MIME
@@ -38,17 +34,19 @@ SED = sed
 .SUFFIXES:
 
 # static configuration, format, and components files
-STATIC_FILES =  MailAliases components digestcomps distcomps forwcomps	\
-		mhl.body mhl.digest mhl.format mhl.forward mhl.headers	\
-		mhl.reply rcvdistcomps rcvdistcomps.outbox		\
-	       	replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD	\
-	       	scan.default scan.mailx scan.nomime scan.size scan.time	\
-	       	scan.timely scan.unseen
+STATIC_FILES = components digestcomps distcomps forwcomps  \
+               mhl.body mhl.digest mhl.format mhl.forward mhl.headers  \
+               mhl.reply rcvdistcomps rcvdistcomps.outbox              \
+               replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD      \
+               scan.nmh scan.mailx scan.nomime scan.size scan.time \
+               scan.timely scan.unseen
 
 # 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
@@ -70,11 +68,8 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 
 mts.conf: $(srcdir)/mts.conf.in Makefile
 	rm -f $@
-	$(SED) -e 's,%mts%,$(MTS),' \
-	       -e 's,%mailspool%,$(mailspool),' \
-	       -e 's,%etcdir%,$(etcdir),' \
-	       -e 's,%masquerade%,$(masquerade),' \
-	       -e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@
+	$(SED) -e 's,%mailspool%,$(mailspool),' \
+	       -e 's,%etcdir%,$(etcdir),' < $(srcdir)/mts.conf.in > $@
 
 sendfiles: $(srcdir)/sendfiles.in Makefile
 	rm -f $@
@@ -83,35 +78,28 @@ sendfiles: $(srcdir)/sendfiles.in Makefile
 install: install-bin-files install-etc-files
 
 install-bin-files:
-	$(top_srcdir)/mkinstalldirs $(bindir)
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
 	for script in $(GENERATED_BIN_FILES); do \
-	  $(INSTALL_PROGRAM) $$script $(bindir)/$$script; \
+	  $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
 	done
 
 install-etc-files:
-	$(top_srcdir)/mkinstalldirs $(etcdir)
+	$(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 $(etcdir)/$$file ]; then \
-	    mv $(etcdir)/$$file $(etcdir)/$$file.prev; \
-	    $(INSTALL_DATA) $$path $(etcdir)/$$file; \
-	    if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
-	      rm $(etcdir)/$$file.prev; \
+	  if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
+	    if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file" ; then \
+	      :; \
 	    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; \
+	      $(INSTALL_DATA) "$$path" "$(DESTDIR)$(etcdir)/$$file.dist"; \
+	      echo "$(DESTDIR)$(etcdir)/$$file has local modifications; installing with .dist suffix"; \
 	    fi; \
 	  else \
-	    $(INSTALL_DATA) $$path $(etcdir)/$$file; \
+	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
 	  fi; \
 	done
 
@@ -119,12 +107,12 @@ uninstall: uninstall-bin-files uninstall-etc-files
 
 uninstall-bin-files:
 	for script in $(GENERATED_BIN_FILES); do \
-	  rm -f $(bindir)/$$script; \
+	  rm -f $(DESTDIR)$(bindir)/$$script; \
 	done
 
 uninstall-etc-files:
 	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
-	  rm -f $(etcdir)/$$file; \
+	  rm -f $(DESTDIR)$(etcdir)/$$file; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -147,12 +135,11 @@ 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)
 	@echo "Copying distribution files in $(subdir)"
 	@for file in $(DIST); do \
 	  cp -p $(srcdir)/$$file $(distdir); \
 	done
-