Synchronizing Makefiles that had gotten out of sync with directory

[mmh] / etc / Makefile.in

diff --git a/etc/Makefile.in b/etc/Makefile.in
index 67eed05..a32ee29 100644 (file)
--- 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,13 +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 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)
@@ -50,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)
@@ -63,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
 
@@ -86,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
@@ -100,7 +110,7 @@ uninstall-files:
 
 uninstall-scripts:
        for script in $(SCRIPTS); do \
-         rm -f $(libdir)/$$script; \
+         rm -f $(bindir)/$$script; \
        done
 
 # ========== DEPENDENCIES FOR CLEANUP ==========