X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/880f5c3a2c6315b73ecb54f2ec4c1a71bb9d6741..54dae008ec9e75cd8625945d78cff47a88261bfa:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 93516da3..3f341088 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,8 @@ TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
 ##
 ## Important note: the "cleanup" test should always be last
 ##
-TESTS = test/bad-input/test-header \
+TESTS = test/ali/test-ali \
+	test/bad-input/test-header \
 	test/burst/test-burst \
 	test/comp/test-comp-format \
 	test/folder/test-create \
@@ -54,8 +55,8 @@ TESTS = test/bad-input/test-header \
 	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/mhbuild/test-forw \
-	test/mhlist/test-mhlist test/mhparam/test-mhparam \
-	test/mhpath/test-mhpath \
+	test/mhlist/test-mhlist test/mhmail/test-mhmail \
+	test/mhparam/test-mhparam test/mhpath/test-mhpath \
 	test/mhshow/test-cte-binary test/mhshow/test-qp \
 	test/mhshow/test-subpart test/mhstore/test-mhstore \
 	test/new/test-basic \
@@ -63,7 +64,7 @@ TESTS = test/bad-input/test-header \
 	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-mhmail \
+	test/post/test-post-group \
 	test/refile/test-refile \
 	test/repl/test-if-str test/repl/test-trailing-newline \
 	test/repl/test-multicomp \
@@ -226,7 +227,8 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
 	     man/unseen.man man/whatnow.man man/whom.man \
 	     test/README $(TESTS) test/inc/deb359167.mbox \
 	     test/inc/fromline.txt test/inc/msgheader.txt test/inc/filler.txt \
-	     test/inc/md5sums test/post/test-post-common.sh uip/mhmail \
+	     test/inc/md5sums test/mhmail/attachment.txt \
+	     test/post/test-post-common.sh uip/mhmail \
 	     SPECS/nmh.spec SPECS/build-nmh-cygwin
 
 ##
@@ -412,6 +414,12 @@ etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
 	rm -f $@
 	$(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.
@@ -424,13 +432,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); \