X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=2d40acfaa9cf4489a4984f8447e0fc915304fd1a;hp=1216177ebcee886a8cc277ca0ae42f464ed04017;hb=bec79382afc185947279c0f3c724c5983944ee7f;hpb=2676fdf95667cfa0fec45372dbb956c8645c1119

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 1216177..2d40acf 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@
@@ -43,15 +42,10 @@ STATIC_FILES = components digestcomps distcomps forwcomps  \
                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,32 +55,16 @@ 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)
+	mkdir -p $(DESTDIR)$(etcdir)
 	INSTALL_FILES="$(GENERATED_ETC_FILES)"; \
 	for file in $(STATIC_FILES); do \
 	  INSTALL_FILES="$$INSTALL_FILES $(srcdir)/$$file"; \
@@ -105,12 +83,7 @@ install-etc-files:
 	  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 \
@@ -123,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
@@ -140,7 +113,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); \