X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=aa0aa258b86d6529258497f303acab5772766bba;hp=42f38e63697e38bc2d2e3840dcf090ffbe7bcfac;hb=fc9279e818dfc96c63a5d75a89080cc68cfe1170;hpb=7593f8f93951b6ca853a72bdbcd0a34dc741bc52

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 42f38e6..aa0aa25 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for etc subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -17,95 +15,51 @@ libdir      = @libdir@
 etcdir      = @sysconfdir@
 
 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
-# content.  Used to create mhn.defaults
-MHNSEARCHPATH = "$(PATH):/usr/demo/SOUND"
-
-# Program used to search path for various programs to
-# handle MIME content.  Used to create mhn.defaults
-MHNSEARCHPROG = $(srcdir)/mhn.find.sh
-
 SED = sed
 
 .SUFFIXES:
 
-# format and components files
-DIST_FILES = mhl.body mhl.digest mhl.format mhl.forward mhl.headers \
-             mhl.reply scan.default scan.mailx scan.nomime scan.size scan.time \
-             scan.timely scan.unseen components digestcomps distcomps \
-             forwcomps rcvdistcomps rcvdistcomps.outbox replcomps \
-	     replgroupcomps MailAliases
-
-# format and configuration files to generate
-GEN_FILES = mhn.defaults mts.conf
-
-# data files we need to install
-FILES = $(DIST_FILES) $(GEN_FILES)
-
-# scripts to install
-SCRIPTS = sendfiles
-
-# auxiliary files
-AUX = Makefile.in mhn.defaults.sh mhn.find.sh mts.conf.in
-
-# all files in this directory included in the distribution
-DIST = $(DIST_FILES) $(SCRIPTS) $(AUX)
+# static configuration, format, and components files
+STATIC_FILES = components digestcomps distcomps forwcomps \
+               mhl.body 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 scan.meillo scan.default \
+               mhn.defaults repllistcomps
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
-all: $(GEN_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),' \
-	       -e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@
-
-install: install-files install-scripts
-
-install-files:
-	$(top_srcdir)/mkinstalldirs $(etcdir)
-	for file in $(DIST_FILES); do \
-	  if [ -f $(etcdir)/$$file ]; then \
-	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
+all:
+
+install: install-etc-files
+
+install-etc-files:
+	mkdir -p $(DESTDIR)$(etcdir)
+	for file in $(STATIC_FILES); do \
+	  if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
+	    if cmp -s "$(srcdir)/$$file" "$(DESTDIR)$(etcdir)/$$file" ; then \
+	      :; \
+	    else \
+	      $(INSTALL_DATA) "$(srcdir)/$$file" "$(DESTDIR)$(etcdir)/$$file.dist"; \
+	      echo "$(DESTDIR)$(etcdir)/$$file has local modifications; installing with .dist suffix"; \
+	    fi; \
+	  else \
+	    $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(etcdir)/$$file; \
 	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/$$file $(etcdir)/$$file; \
-	done
-	for file in $(GEN_FILES); do \
-	  if [ -f $(etcdir)/$$file ]; then \
-	    mv $(etcdir)/$$file $(etcdir)/$$file.old; \
-	  fi; \
-	  $(INSTALL_DATA) $$file $(etcdir)/$$file; \
 	done
 
-install-scripts:
-	$(top_srcdir)/mkinstalldirs $(bindir)
-	for script in $(SCRIPTS); do \
-	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
-	done
+uninstall: uninstall-etc-files
 
-uninstall: uninstall-files uninstall-scripts
-
-uninstall-files:
-	for file in $(FILES); do \
-	  rm -f $(etcdir)/$$file; \
-	done
-
-uninstall-scripts:
-	for script in $(SCRIPTS); do \
-	  rm -f $(bindir)/$$script; \
+uninstall-etc-files:
+	for file in $(STATIC_FILES) ; do \
+	  rm -f $(DESTDIR)$(etcdir)/$$file; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -114,7 +68,6 @@ mostlyclean:
 	rm -f *~
 
 clean: mostlyclean
-	rm -f $(GEN_FILES)
 
 distclean: clean
 	rm -f Makefile
@@ -128,12 +81,5 @@ superclean: realclean
 subdir = etc
 
 Makefile: Makefile.in ../config.status
-	cd .. && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
- 
-distdir = ../`cat ../distname`/$(subdir)
-nmhdist: $(DIST)
-	@echo "Copying distribution files in $(subdir)"
-	@for file in $(DIST); do \
-	  cp -p $(srcdir)/$$file $(distdir); \
-	done
+	cd .. && ./config.status $(subdir)/$@