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 2d40acf..6584471 100644 (file)
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -21,14 +21,6 @@ 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:
@@ -39,54 +31,39 @@ STATIC_FILES = components digestcomps distcomps forwcomps  \
                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
-
-# templates and scripts from which non-static files are generated
-GENERATED_FILE_SRCS = mhn.defaults.sh mhn.find.sh
-
-# non-scripts generated using above GENERATED_FILE_SRCs
-GENERATED_ETC_FILES = mhn.defaults
+               scan.timely scan.unseen mhn.defaults
 
 # 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) $(AUX)
+DIST = $(STATIC_FILES) $(AUX)
 
 # ========= DEPENDENCIES FOR BUILDING ==========
 
-all: $(GENERATED_ETC_FILES)
-
-mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
-       rm -f $@
-       $(srcdir)/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
+all:
 
 install: install-etc-files
 
 install-etc-files:
        mkdir -p $(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`; \
          if [ -f "$(DESTDIR)$(etcdir)/$$file" ]; then \
-           if cmp -s "$$path" "$(DESTDIR)$(etcdir)/$$file" ; then \
+           if cmp -s "$(srcdir)/$$file" "$(DESTDIR)$(etcdir)/$$file" ; then \
              :; \
            else \
-             $(INSTALL_DATA) "$$path" "$(DESTDIR)$(etcdir)/$$file.dist"; \
+             $(INSTALL_DATA) "$(srcdir)/$$file" "$(DESTDIR)$(etcdir)/$$file.dist"; \
              echo "$(DESTDIR)$(etcdir)/$$file has local modifications; installing with .dist suffix"; \
            fi; \
          else \
-           $(INSTALL_DATA) $$path $(DESTDIR)$(etcdir)/$$file; \
+           $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(etcdir)/$$file; \
          fi; \
        done
 
 uninstall: uninstall-etc-files
 
 uninstall-etc-files:
-       for file in $(STATIC_FILES) $(GENERATED_ETC_FILES); do \
+       for file in $(STATIC_FILES) ; do \
          rm -f $(DESTDIR)$(etcdir)/$$file; \
        done
 
@@ -96,7 +73,6 @@ mostlyclean:
        rm -f *~
 
 clean: mostlyclean
-       rm -f $(GENERATED_ETC_FILES)
 
 distclean: clean
        rm -f Makefile