X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=etc%2FMakefile.in;h=8277cc8ba65d12778daba1299290242c9724944c;hb=196ab2784742130c5863aab2eeb7f8a1194b1b96;hp=10111e7c30ff6365f728cbb3301611e3d42a7b2c;hpb=0e82199cf3c991a173e0ac8aa776efdb3ded61e6;p=mmh

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 10111e7..8277cc8 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -21,72 +21,49 @@ 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:
 
 # static configuration, format, and components files
 STATIC_FILES = components digestcomps distcomps forwcomps  \
-               mhl.body mhl.digest mhl.format mhl.forward mhl.headers  \
+               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
-
-# 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 scan.meillo 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:
-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(etcdir)
-	INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
+	mkdir -p $(DESTDIR)$(etcdir)
 	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
@@ -113,7 +89,7 @@ Makefile: Makefile.in ../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); \