Don't allow blind aliases with sendmail/pipe mts. Before this change,

[mmh] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a8d14b3..6d15d9f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,10 +42,10 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
 ##
 ## Important note: the "cleanup" test should always be last
 ##
-TESTS = test/ali/test-ali \
+TESTS = test/ali/test-ali test/anno/test-anno \
        test/bad-input/test-header \
        test/burst/test-burst \
-       test/comp/test-comp-format \
+       test/comp/test-comp-format test/dist/test-dist \
        test/folder/test-create test/folder/test-packf \
        test/folder/test-recurse test/folder/test-sortm \
        test/folder/test-total \
@@ -54,8 +54,8 @@ TESTS = test/ali/test-ali \
        test/format/test-myhost test/format/test-mymbox \
        test/forw/test-forw-digest test/forw/test-forw-format \
        test/inc/test-deb359167 test/inc/test-eom-align \
-       test/inc/test-inc-scanout test/install-mh/test-install-mh \
-       test/manpages/test-manpages \
+       test/inc/test-inc-scanout test/inc/test-msgchk \
+       test/install-mh/test-install-mh test/manpages/test-manpages \
        test/mhbuild/test-forw test/mhbuild/test-utf8-body \
        test/mhlist/test-mhlist test/mhmail/test-mhmail \
        test/mhparam/test-mhparam test/mhpath/test-mhpath \
@@ -70,7 +70,7 @@ TESTS = test/ali/test-ali \
        test/post/test-post-group test/post/test-mts test/post/test-messageid \
        test/prompter/test-prompter \
        test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \
-       test/refile/test-refile \
+       test/rcv/test-rcvtty test/refile/test-refile \
        test/repl/test-if-str test/repl/test-trailing-newline \
        test/repl/test-multicomp test/repl/test-repl \
        test/scan/test-scan test/scan/test-scan-multibyte \
@@ -132,7 +132,9 @@ bin_SCRIPTS = uip/mhmail etc/sendfiles
 ##
 auxexec_PROGRAMS = uip/ap uip/conflict uip/dp uip/fmtdump uip/mhl uip/post \
                   uip/rcvdist uip/rcvpack uip/rcvstore uip/rcvtty uip/slocal \
-                  uip/spost uip/viamail uip/mhtest
+                  uip/viamail uip/mhtest
+
+auxexec_SCRIPTS = uip/spost
 
 ##
 ## Internal libraries that we create as part of the build process
@@ -381,8 +383,6 @@ uip_rcvtty_LDADD = $(LDADD) $(TERMLIB) $(ICONVLIB)
 uip_slocal_SOURCES = uip/slocal.c uip/aliasbr.c uip/dropsbr.c
 uip_slocal_LDADD = $(LDADD) $(NDBM_LIBS)
 
-uip_spost_SOURCES = uip/spost.c uip/aliasbr.c
-
 uip_viamail_SOURCES = uip/viamail.c uip/mhmisc.c uip/mhoutsbr.c uip/sendsbr.c \
                      uip/annosbr.c uip/distsbr.c
 
@@ -405,18 +405,18 @@ sbr/sigmsg.h: $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H)
        $(AWK) -f $(srcdir)/sbr/sigmsg.awk $(SIGNAL_H) > $@
 
 etc/mts.conf: $(srcdir)/etc/mts.conf.in Makefile
-       rm -f $@
+       @rm -f $@
        $(SED) -e 's,%mts%,$(MTS),' \
               -e 's,%mailspool%,$(mailspool),' \
               -e 's,%smtpservers%,$(smtpservers),' \
                                < $(srcdir)/etc/mts.conf.in > $@
 
 etc/mhn.defaults: $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPROG)
-       rm -f $@
+       @rm -f $@
        $(srcdir)/etc/mhn.defaults.sh $(MHNSEARCHPATH) $(MHNSEARCHPROG) > $@
 
 etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
-       rm -f $@
+       @rm -f $@
        $(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/etc/sendfiles.in > $@
 
 ##
@@ -430,13 +430,13 @@ LN = @LN@
 ## between different programs.
 ##
 install-exec-hook:
-       rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
-       rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/folders$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/fnext$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/fprev$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
+       @rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
        $(LN) $(DESTDIR)$(bindir)/flist$(EXEEXT) $(DESTDIR)$(bindir)/flists$(EXEEXT)
        $(LN) $(DESTDIR)$(bindir)/folder$(EXEEXT) $(DESTDIR)$(bindir)/folders$(EXEEXT)
        $(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fnext$(EXEEXT)