X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=a32ee29f7b2b7382e61d5a4d130a63531da504c3;hp=e58951ea2c5049bf8b1748eb334ecc437bb3283c;hb=98dfa6e68dd83922cddf00ebe2a986d076c250d0;hpb=03560c9427c1ae048364d0bb0306cd3c803a0d6d

diff --git a/etc/Makefile.in b/etc/Makefile.in
index e58951e..a32ee29 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -16,7 +16,9 @@ bindir      = @bindir@
 libdir      = @libdir@
 etcdir      = @sysconfdir@
 
-mailspool    = @mailspool@
+mailspool   = @mailspool@
+masquerade  = @masquerade@
+smtpservers = @smtpservers@
 
 INSTALL         = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -35,14 +37,15 @@ 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
+DIST_FILES = MailAliases components digestcomps distcomps forwcomps	\
+	     mhl.body mhl.digest mhl.format mhl.forward mhl.headers	\
+             mhl.reply mts.conf.in rcvdistcomps rcvdistcomps.outbox	\
+	     replcomps replgroupcomps scan.MMDDYY scan.YYYYMMDD		\
+	     scan.default scan.mailx scan.nomime scan.size scan.time	\
+	     scan.timely scan.unseen sendfiles.in
 
 # format and configuration files to generate
-GEN_FILES = mhn.defaults mts.conf
+GEN_FILES = mhn.defaults mts.conf sendfiles
 
 # data files we need to install
 FILES = $(DIST_FILES) $(GEN_FILES)
@@ -51,7 +54,7 @@ FILES = $(DIST_FILES) $(GEN_FILES)
 SCRIPTS = sendfiles
 
 # auxiliary files
-AUX = Makefile.in mhn.defaults.sh mhn.find.sh mts.conf.in
+AUX = Makefile.in mhn.defaults.sh mhn.find.sh
 
 # all files in this directory included in the distribution
 DIST = $(DIST_FILES) $(SCRIPTS) $(AUX)
@@ -64,10 +67,16 @@ mhn.defaults: $(srcdir)/mhn.defaults.sh $(MHNSEARCHPROG)
 	rm -f $@
 	$(srcdir)/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
-mts.conf: $(srcdir)/mts.conf.in
+mts.conf: $(srcdir)/mts.conf.in Makefile
 	rm -f $@
 	$(SED) -e 's,%mailspool%,$(mailspool),' \
-	       -e 's,%etcdir%,$(etcdir),' < $(srcdir)/mts.conf.in > $@
+	       -e 's,%etcdir%,$(etcdir),' \
+	       -e 's,%masquerade%,$(masquerade),' \
+	       -e 's,%smtpservers%,$(smtpservers),' < $(srcdir)/mts.conf.in > $@
+
+sendfiles: $(srcdir)/sendfiles.in Makefile
+	rm -f $@
+	$(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/sendfiles.in > $@
 
 install: install-files install-scripts
 
@@ -87,9 +96,9 @@ install-files:
 	done
 
 install-scripts:
-	$(top_srcdir)/mkinstalldirs $(libdir)
+	$(top_srcdir)/mkinstalldirs $(bindir)
 	for script in $(SCRIPTS); do \
-	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(libdir)/$$script; \
+	  $(INSTALL_PROGRAM) $(srcdir)/$$script $(bindir)/$$script; \
 	done
 
 uninstall: uninstall-files uninstall-scripts
@@ -101,7 +110,7 @@ uninstall-files:
 
 uninstall-scripts:
 	for script in $(SCRIPTS); do \
-	  rm -f $(libdir)/$$script; \
+	  rm -f $(bindir)/$$script; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========