X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=ad6b1e64afefd44378b0486001f690c41d04ec5c;hb=809e4cb1458859eac403bf2e23d717c23a9cc892;hp=adf3f890198e6080f85be414c29209cfa5d77879;hpb=305a4cd7666fe9e2922b9d6541ef3ff2420c2168;p=mmh

diff --git a/Makefile.am b/Makefile.am
index adf3f89..ad6b1e6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -36,7 +36,8 @@ auxexecdir = @libdir@
 TESTS_ENVIRONMENT = MH_OBJ_DIR=@abs_builddir@ \
 		    MH_TEST_DIR=@abs_builddir@/test/testdir \
 		    auxexecdir=$(auxexecdir) bindir=$(bindir) \
-		    mandir=$(mandir) sysconfdir=$(sysconfdir)
+		    mandir=$(mandir) sysconfdir=$(sysconfdir) \
+		    $(TESTS_SHELL) ## Keep at end of TESTS_ENVIRONMENT.
 ##
 ## Important note: the "cleanup" test should always be last
 ##
@@ -81,7 +82,7 @@ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 CLEANFILES = config/version.c sbr/sigmsg.h etc/mts.conf etc/sendfiles \
 	     etc/mhn.defaults man/man.sed man/mh-chart.man $(man_MANS)
 clean-local:
-	@rm -rf RPM a.out.DSYM uip/a.out.DSYM
+	@rm -rf RPM a.out.dSYM uip/a.out.dSYM
 	@rm -rf test/testdir
 
 ##
@@ -201,7 +202,7 @@ man_MANS = man/ali.1 man/anno.1 man/ap.8 man/burst.1 man/comp.1 \
 ## Automake using the automatic rules
 ##
 EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
-	     etc/mhn.defaults.sh $(MHNSEARCHPROG) DATE \
+	     etc/mhn.defaults.sh $(MHNSEARCHPROG) DATE MACHINES \
 	     docs/ChangeLog_MH-3_to_MH-6.6 \
 	     docs/ChangeLog_MH-6.7.0_to_MH-6.8.4.html \
 	     man/ali.man man/anno.man man/ap.man man/burst.man man/comp.man \
@@ -224,7 +225,7 @@ EXTRA_DIST = config/version.sh sbr/sigmsg.awk etc/mts.conf.in etc/sendfiles.in \
 	     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 \
-	     SPECS/nmh.spec
+	     SPECS/nmh.spec SPECS/build-nmh-cygwin
 
 ##
 ## These are all of the definitions for each of the programs listed above.
@@ -414,6 +415,10 @@ etc/sendfiles: $(srcdir)/etc/sendfiles.in Makefile
 ##
 ## This rule gets called at "make install" time; we use it to create links
 ## between different programs.
+## On Cygwin, the choice of ln or ln -s must be made at install time,
+## not configure time, because some filesystems (NTFS) support hard
+## links but others (FAT32) don't.  The fallback to cp -p might not be
+## needed, but it's here just in case.
 ##
 install-exec-hook:
 	rm -f $(DESTDIR)$(bindir)/flists$(EXEEXT)
@@ -423,13 +428,29 @@ install-exec-hook:
 	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)
-	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)
+	cd $(DESTDIR)$(bindir) && \
+	  if ln flist$(EXEEXT) flists$(EXEEXT) 2>/dev/null && \
+	    ln folder$(EXEEXT) folders$(EXEEXT) && \
+	    ln new$(EXEEXT) fnext$(EXEEXT) && \
+	    ln new$(EXEEXT) fprev$(EXEEXT) && \
+	    ln new$(EXEEXT) unseen$(EXEEXT) && \
+	    ln show$(EXEEXT) prev$(EXEEXT) && \
+	    ln show$(EXEEXT) next$(EXEEXT); then :; \
+	  elif ln -s flist$(EXEEXT) flists$(EXEEXT) 2>/dev/null && \
+	    ln -s folder$(EXEEXT) folders$(EXEEXT) && \
+	    ln -s new$(EXEEXT) fnext$(EXEEXT) && \
+	    ln -s new$(EXEEXT) fprev$(EXEEXT) && \
+	    ln -s new$(EXEEXT) unseen$(EXEEXT) && \
+	    ln -s show$(EXEEXT) prev$(EXEEXT) && \
+	    ln -s show$(EXEEXT) next$(EXEEXT); then :; \
+	  else cp -p flist$(EXEEXT) flists$(EXEEXT) && \
+	    cp -p folder$(EXEEXT) folders$(EXEEXT) && \
+	    cp -p new$(EXEEXT) fnext$(EXEEXT) && \
+	    cp -p new$(EXEEXT) fprev$(EXEEXT) && \
+	    cp -p new$(EXEEXT) unseen$(EXEEXT) && \
+	    cp -p show$(EXEEXT) prev$(EXEEXT) && \
+	    cp -p show$(EXEEXT) next$(EXEEXT); \
+	  fi
 	if test x$(SETGID_MAIL) != x; then \
 		chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \
 		chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \
@@ -457,7 +478,7 @@ sbr_libmh_a_SOURCES = sbr/addrsbr.c sbr/ambigsw.c sbr/atooi.c sbr/brkstring.c \
 		      sbr/context_replace.c sbr/context_save.c \
 		      sbr/copy.c sbr/copyip.c sbr/cpydata.c \
 		      sbr/cpydgst.c sbr/crawl_folders.c sbr/discard.c \
-		      sbr/done.c sbr/dtime.c sbr/escape_display_name.c \
+		      sbr/done.c sbr/dtime.c sbr/escape_addresses.c \
 		      sbr/error.c  sbr/ext_hook.c sbr/fdcompare.c \
 		      sbr/folder_addmsg.c sbr/folder_delmsgs.c \
 		      sbr/folder_free.c sbr/folder_pack.c \