X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2FMakefile.in;h=42f38e63697e38bc2d2e3840dcf090ffbe7bcfac;hp=67eed058d0e99b12713470bac45caab72e60306c;hb=7593f8f93951b6ca853a72bdbcd0a34dc741bc52;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 67eed05..42f38e6 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@
@@ -38,7 +40,8 @@ SED = sed
 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
+             forwcomps rcvdistcomps rcvdistcomps.outbox replcomps \
+	     replgroupcomps MailAliases
 
 # format and configuration files to generate
 GEN_FILES = mhn.defaults mts.conf
@@ -63,10 +66,12 @@ 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 > $@
 
 install: install-files install-scripts
 
@@ -86,9 +91,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
@@ -100,7 +105,7 @@ uninstall-files:
 
 uninstall-scripts:
 	for script in $(SCRIPTS); do \
-	  rm -f $(libdir)/$$script; \
+	  rm -f $(bindir)/$$script; \
 	done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========