X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=etc%2FMakefile.in;h=66e42ada56533c7cd41c2df20bec12c19cfb0099;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hp=ad43e9dbc98feb8179cab3219b118da3f0935c54;hpb=82e9ded8c02ea347c9cb9a8e507d0d0e5b2acc3b;p=mmh

diff --git a/etc/Makefile.in b/etc/Makefile.in
index ad43e9d..66e42ad 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -16,12 +16,14 @@ 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
@@ -47,24 +49,23 @@ 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
 
-# files generated using above GENERATED_FILE_SRCs
-GENERATED_FILES = mhn.defaults mts.conf sendfiles
+# 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
 
-# data files we need to install (in etc)
-INSTALL_FILES = $(STATIC_FILES) $(GENERATED_FILES)
-
-# scripts we need to install (in bin)
-SCRIPTS = sendfiles
+# non-scripts generated using above GENERATED_FILE_SRCs
+GENERATED_ETC_FILES = mhn.defaults mts.conf
 
 # auxiliary files (included in distribution but not installed)
 AUX = Makefile.in
 
 # all non-generated files in this directory are included in the distribution
-DIST = $(STATIC_FILES) $(GENERATED_FILE_SRCS) $(SCRIPTS) $(AUX)
+DIST = $(STATIC_FILES) $(GENERATED_FILE_SRCS) $(AUX)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
-all: $(GENERATED_FILES)
+all: $(GENERATED_BIN_FILES) $(GENERATED_ETC_FILES)
 
 mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 	rm -f $@
@@ -72,7 +73,8 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 
 mts.conf: $(srcdir)/mts.conf.in Makefile
 	rm -f $@
-	$(SED) -e 's,%mailspool%,$(mailspool),' \
+	$(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 > $@
@@ -81,37 +83,51 @@ sendfiles: $(srcdir)/sendfiles.in Makefile
 	rm -f $@
 	$(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/sendfiles.in > $@
 
-install: install-files install-scripts
+install: install-bin-files install-etc-files
 
-install-files:
-	$(top_srcdir)/mkinstalldirs $(etcdir)
-	for file in $(INSTALL_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; \
-	  fi; \
+install-bin-files:
+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+	for script in $(GENERATED_BIN_FILES); do \
+	  $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
 	done
 
-install-scripts:
-	$(top_srcdir)/mkinstalldirs $(bindir)
-	for script in $(SCRIPTS); do \
-	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
+install-etc-files:
+	$(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-files uninstall-scripts
+uninstall: uninstall-bin-files uninstall-etc-files
 
-uninstall-files:
-	for file in $(INSTALL_FILES); do \
-	  rm -f $(etcdir)/$$file; \
+uninstall-bin-files:
+	for script in $(GENERATED_BIN_FILES); do \
+	  rm -f $(DESTDIR)$(bindir)/$$script; \
 	done
 
-uninstall-scripts:
-	for script in $(SCRIPTS); do \
-	  rm -f $(bindir)/$$script; \
+uninstall-etc-files:
+	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
+	  rm -f $(DESTDIR)$(etcdir)/$$file; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -120,7 +136,7 @@ mostlyclean:
 	rm -f *~
 
 clean: mostlyclean
-	rm -f $(GENERATED_FILES)
+	rm -f $(GENERATED_ETC_FILES) $(GENERATED_BIN_FILES)
 
 distclean: clean
 	rm -f Makefile
@@ -134,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)