X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.am;h=3f56a7049079e1650f0d134129ed8f9caa82d622;hb=d4850ff231bec8513dcd106bdb93bc61d179d8f6;hp=d64fa3cd79b942839c78043c6219cb81dfaca151;hpb=603d80d3a5fb399830d589406a5f55f280b0bcb5;p=mmh

diff --git a/Makefile.am b/Makefile.am
index d64fa3c..3f56a70 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,8 +54,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 \
@@ -96,7 +96,7 @@ MAINTAINERCLEANFILES = cscope.files cscope.out
 ##
 SUPERCLEANFILES = ChangeLog Makefile.in aclocal.m4 compile config.guess \
 		  config.h.in config.h.in~ config.sub configure depcomp \
-		  install-sh missing ylwrap nmh-*.tar.gz
+		  install-sh missing ylwrap nmh-*.tar.gz nmh-*.tar.gz.sig
 superclean: maintainer-clean
 	@rm -f $(SUPERCLEANFILES)
 .PHONY: superclean
@@ -113,13 +113,13 @@ BUILT_SOURCES = sbr/sigmsg.h
 ##
 bin_PROGRAMS = uip/ali uip/anno uip/burst uip/comp uip/dist uip/flist \
 	       uip/folder uip/forw uip/inc uip/install-mh uip/mark \
-	       uip/mhbuild uip/mhlist uip/mhmail uip/mhn uip/mhparam \
+	       uip/mhbuild uip/mhlist uip/mhn uip/mhparam \
 	       uip/mhpath uip/mhshow uip/mhstore uip/msgchk uip/msh uip/new \
 	       uip/packf uip/pick uip/prompter uip/refile uip/repl uip/rmf \
 	       uip/rmm uip/scan uip/send uip/show uip/sortm uip/whatnow \
 	       uip/whom
 
-bin_SCRIPTS = etc/sendfiles
+bin_SCRIPTS = uip/mhmail etc/sendfiles
 
 ##
 ## This is all programs that get installed in the "lib" directory
@@ -226,7 +226,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 \
+	     test/inc/md5sums test/mhmail/attachment.txt \
+	     test/post/test-post-common.sh uip/mhmail \
 	     SPECS/nmh.spec SPECS/build-nmh-cygwin
 
 ##
@@ -275,8 +276,6 @@ uip_mhlist_SOURCES = uip/mhlist.c uip/mhparse.c uip/mhcachesbr.c \
 		     uip/md5.c
 uip_mhlist_LDADD = $(LDADD) $(TERMLIB)
 
-uip_mhmail_SOURCES = uip/mhmail.c
-
 uip_mhn_SOURCES = uip/mhn.c uip/mhparse.c uip/mhcachesbr.c uip/mhshowsbr.c \
 		  uip/mhlistsbr.c uip/mhstoresbr.c uip/mhmisc.c uip/mhfree.c \
 		  uip/termsbr.c uip/md5.c
@@ -417,10 +416,6 @@ 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)
@@ -430,29 +425,13 @@ install-exec-hook:
 	rm -f $(DESTDIR)$(bindir)/unseen$(EXEEXT)
 	rm -f $(DESTDIR)$(bindir)/prev$(EXEEXT)
 	rm -f $(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
+	@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)
 	if test x$(SETGID_MAIL) != x; then \
 		chgrp $(MAIL_SPOOL_GRP) $(DESTDIR)$(bindir)/inc$(EXEEXT) && \
 		chmod 2755 $(DESTDIR)$(bindir)/inc$(EXEEXT); \
@@ -641,7 +620,7 @@ upload: dist
 	@echo "Did you run 'make distcheck' already?"
 	@if test -z "$(SKIP_GPG_SIG)"; then \
 		echo "Creating GPG signature (set SKIP_GPG_SIG to bypass this step)"; \
-		gpg --output $(DIST_ARCHIVES).sig --detatch-sig $(DIST_ARCHIVES); \
+		gpg --output $(DIST_ARCHIVES).sig --detach-sig $(DIST_ARCHIVES); \
 	fi
 	@echo "Setting permissions for savannah.gnu.org"
 	chmod 664 $(DIST_ARCHIVES)