Make mhn.defaults a static file and removed the scripts that built it.

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 67eed05..6584471 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,8 +1,6 @@
 #
 # Makefile for etc subdirectory
 #
-# $Id$
-#
 
 SHELL = /bin/sh
 
@@ -16,91 +14,57 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-mailspool    = @mailspool@
+mailspool   = @mailspool@
 
 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 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)
+# static configuration, format, and components files
+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 mhn.defaults
 
-# scripts to install
-SCRIPTS = sendfiles
+# auxiliary files (included in distribution but not installed)
+AUX = Makefile.in
 
-# 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)
+# all non-generated files in this directory are included in the distribution
+DIST = $(STATIC_FILES) $(AUX)
 
 # ========= 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
-       rm -f $@
-       $(SED) -e 's,%mailspool%,$(mailspool),' \
-              -e 's,%etcdir%,$(etcdir),' < $(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; \
-         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; \
+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) $$file $(etcdir)/$$file; \
-       done
-
-install-scripts:
-       $(top_srcdir)/mkinstalldirs $(libdir)
-       for script in $(SCRIPTS); do \
-         $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \
        done
 
-uninstall: uninstall-files uninstall-scripts
+uninstall: uninstall-etc-files
 
-uninstall-files:
-       for file in $(FILES); do \
-         rm -f $(etcdir)/$$file; \
-       done
-
-uninstall-scripts:
-       for script in $(SCRIPTS); do \
-         rm -f $(libdir)/$$script; \
+uninstall-etc-files:
+       for file in $(STATIC_FILES) ; do \
+         rm -f $(DESTDIR)$(etcdir)/$$file; \
        done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
@@ -109,7 +73,6 @@ mostlyclean:
        rm -f *~
 
 clean: mostlyclean
-       rm -f $(GEN_FILES)
 
 distclean: clean
        rm -f Makefile
@@ -123,12 +86,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)
+mmhdist: $(DIST)
        @echo "Copying distribution files in $(subdir)"
        @for file in $(DIST); do \
          cp -p $(srcdir)/$$file $(distdir); \
        done
-