X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=387c31cc87a95b519469f32d8eeea7d1456bf1b5;hb=39b0d6244fe3906648ce40336a2c6e8a7d9dd783;hp=31e710995051ae2e2f76242724406d434a74ae82;hpb=1186f294d7e907788140fd71bbd4d375fa24c2e8;p=mmh

diff --git a/Makefile.am b/Makefile.am
index 31e7109..387c31c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,10 +33,10 @@ auxexecdir = @libdir@
 ##
 ## nmh _does_ have a test suite!
 ##
-TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
-		    MH_TEST_DIR=@abs_builddir@/test/testdir \
-		    auxexecdir=$(auxexecdir) bindir=$(bindir) \
-		    mandir=$(mandir) sysconfdir=$(sysconfdir) \
+TESTS_ENVIRONMENT = MH_OBJ_DIR="@abs_builddir@" \
+		    MH_TEST_DIR="@abs_builddir@/test/testdir" \
+		    auxexecdir="$(auxexecdir)" bindir="$(bindir)" \
+		    mandir="$(mandir)" sysconfdir="$(sysconfdir)" \
 		    MULTIBYTE_ENABLED=$(MULTIBYTE_ENABLED) \
 		    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
 ##
@@ -46,10 +46,11 @@ TESTS = test/ali/test-ali \
 	test/bad-input/test-header \
 	test/burst/test-burst \
 	test/comp/test-comp-format \
-	test/folder/test-create \
-	test/folder/test-total test/format/test-localmbox \
-	test/format/test-myname test/format/test-myhost \
-	test/format/test-mymbox \
+	test/folder/test-create test/folder/test-packf \
+	test/folder/test-sortm test/folder/test-total \
+	test/format/test-dp test/format/test-fmtdump \
+	test/format/test-localmbox test/format/test-myname \
+	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 \
@@ -64,10 +65,12 @@ TESTS = test/ali/test-ali \
 	test/post/test-post-basic test/post/test-post-multiple \
 	test/post/test-post-dcc test/post/test-post-fcc \
 	test/post/test-post-multifrom test/post/test-post-envelope \
-	test/post/test-post-group \
+	test/post/test-post-group test/post/test-mts \
+	test/prompter/test-prompter \
+	test/rcv/test-rcvdist test/rcv/test-rcvpack test/rcv/test-rcvstore \
 	test/refile/test-refile \
 	test/repl/test-if-str test/repl/test-trailing-newline \
-	test/repl/test-multicomp \
+	test/repl/test-multicomp test/repl/test-repl \
 	test/scan/test-scan test/scan/test-scan-multibyte \
 	test/sequences/test-flist test/sequences/test-mark \
 	test/whatnow/test-attach-detach test/whatnow/test-cd \
@@ -225,7 +228,7 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
 	     man/rmf.man man/rmm.man man/scan.man man/send.man \
 	     man/sendfiles.man man/show.man man/slocal.man man/sortm.man \
 	     man/unseen.man man/whatnow.man man/whom.man \
-	     test/README $(TESTS) test/inc/deb359167.mbox \
+	     test/README test/fakesendmail $(TESTS) test/inc/deb359167.mbox \
 	     test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \
 	     test/inc/md5sums test/mhmail/attachment.txt \
 	     test/post/test-post-common.sh uip/mhmail \
@@ -415,6 +418,12 @@ etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
 	$(SED) -e 's,%libdir%,$(libdir),' < $(srcdir)/etc/sendfiles.in > $@
 
 ##
+## Use configure to set up default LN, but through a make variable so
+## that it can be overridden at install time.
+##
+LN = @LN@
+
+##
 ## This rule gets called at "make install" time; we use it to create links
 ## between different programs.
 ##
@@ -426,13 +435,13 @@ install-exec-hook:
 	rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/next$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/flist$(EXEEXT) $(DESTDIR)$(bindir)/flists$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/folder$(EXEEXT) $(DESTDIR)$(bindir)/folders$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fnext$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fprev$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/unseen$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT)
-	@LINK_FILE@ $(DESTDIR)$(bindir)/show$(EXEEXT) $(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)
+	$(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/fprev$(EXEEXT)
+	$(LN) $(DESTDIR)$(bindir)/new$(EXEEXT) $(DESTDIR)$(bindir)/unseen$(EXEEXT)
+	$(LN) $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/prev$(EXEEXT)
+	$(LN) $(DESTDIR)$(bindir)/show$(EXEEXT) $(DESTDIR)$(bindir)/next$(EXEEXT)
 	if test x$(SETGID_MAIL) != x; then \
 		chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \
 		chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \