X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=10111e7c30ff6365f728cbb3301611e3d42a7b2c;hp=e37b5f0decaf2a21bf5184f961cff6debe8e5b24;hb=2d2016f0dfc9e036549ff035f0ae897c9b2d5fe4;hpb=fce8a87e8a4a443a08a98b24eef270451a63fab8

diff --git a/etc/Makefile.in b/etc/Makefile.in
index e37b5f0..10111e7 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -15,7 +15,6 @@ libdir      = @libdir@
 etcdir      = @sysconfdir@
 
 mailspool   = @mailspool@
-masquerade  = @masquerade@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -39,19 +38,14 @@ 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.default scan.mailx scan.nomime scan.size scan.time \
+               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; don't add binaries
-# to this list, as they'll get installed with INSTALL_SCRIPT and won't
-# be stripped.
-GENERATED_BIN_FILES = sendfiles
+GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh
 
 # non-scripts generated using above GENERATED_FILE_SRCs
-GENERATED_ETC_FILES = mhn.defaults mts.conf
+GENERATED_ETC_FILES = mhn.defaults
 
 # auxiliary files (included in distribution but not installed)
 AUX = Makefile.in
@@ -61,29 +55,13 @@ DIST = $(STATIC_FILES) $(GENERATED_FILE_SRCS) $(AUX)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
-all: $(GENERATED_BIN_FILES) $(GENERATED_ETC_FILES)
+all: $(GENERATED_ETC_FILES)
 
 mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 	rm -f $@
 	$(srcdir)/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
-mts.conf: $(srcdir)/mts.conf.in Makefile
-	rm -f $@
-	$(SED) -e 's,%mailspool%,$(mailspool),' \
-	       -e 's,%etcdir%,$(etcdir),' \
-	       -e 's,%masquerade%,$(masquerade),' < $(srcdir)/mts.conf.in > $@
-
-sendfiles: $(srcdir)/sendfiles.in Makefile
-	rm -f $@
-	$(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/sendfiles.in > $@
-
-install: install-bin-files install-etc-files
-
-install-bin-files:
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-	for script in $(GENERATED_BIN_FILES); do \
-	  $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir)/$$script; \
-	done
+install: install-etc-files
 
 install-etc-files:
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
@@ -93,25 +71,19 @@ install-etc-files:
 	done; \
 	for path in $$INSTALL_FILES; do \
 	  file=`basename $$path`; \
-	  echo "Installing $$file..."; \
 	  if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
-	    if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file"; then \
-	      echo "$(DESTDIR)$(etcdir)/$$file unchanged, skipped"; \
+	    if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file" ; then \
+	      :; \
 	    else \
 	      $(INSTALL_DATA) "$$path" "$(DESTDIR)$(etcdir)/$$file.dist"; \
-	      echo "INFO: $(DESTDIR)$(etcdir)/$$file installed with .dist extension"; \
+	      echo "$(DESTDIR)$(etcdir)/$$file has local modifications; installing with .dist suffix"; \
 	    fi; \
 	  else \
 	    $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
 	  fi; \
 	done
 
-uninstall: uninstall-bin-files uninstall-etc-files
-
-uninstall-bin-files:
-	for script in $(GENERATED_BIN_FILES); do \
-	  rm -f $(DESTDIR)$(bindir)/$$script; \
-	done
+uninstall: uninstall-etc-files
 
 uninstall-etc-files:
 	for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
@@ -124,7 +96,7 @@ mostlyclean:
 	rm -f *~
 
 clean: mostlyclean
-	rm -f $(GENERATED_ETC_FILES) $(GENERATED_BIN_FILES)
+	rm -f $(GENERATED_ETC_FILES)
 
 distclean: clean
 	rm -f Makefile