X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=etc%2FMakefile.in;h=20ea6d525f6e82f47b44a841ffe7a1d90df455b7;hb=35c228531bc8e00d43be590255df9408a4fcbe19;hp=c2645cbe03e05e17434ac8f99147b78793ca0216;hpb=df7b16cb148474b3b80dbf1e226e858cf1e47edb;p=mmh

diff --git a/etc/Makefile.in b/etc/Makefile.in
index c2645cb..20ea6d5 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -54,12 +54,6 @@ 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
 
@@ -90,32 +84,46 @@ 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; \
+	for script in $(GENERATED_BIN_FILES); do \
+	  $(INSTALL_PROGRAM) $$script $(bindir)/$$script; \
 	done
 
 install-etc-files:
 	$(top_srcdir)/mkinstalldirs $(etcdir)
-	for file in $(INSTALL_ETC_FILES); do \
-	  echo $$file; \
+	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; \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-	  if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
-	    rm $(etcdir)/$$file.prev; \
+	    $(INSTALL_DATA) $$path $(etcdir)/$$file; \
+	    if diff $(etcdir)/$$file.prev $(etcdir)/$$file; then \
+	      rm $(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 $(etcdir)/$$file; \
 	  fi; \
 	done
 
 uninstall: uninstall-bin-files uninstall-etc-files
 
 uninstall-bin-files:
-	for script in $(INSTALL_BIN_FILES); do \
+	for script in $(GENERATED_BIN_FILES); do \
 	  rm -f $(bindir)/$$script; \
 	done
 
 uninstall-etc-files:
-	for file in $(INSTALL_ETC_FILES); do \
+	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
 	  rm -f $(etcdir)/$$file; \
 	done
 
@@ -139,7 +147,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)