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

diff --git a/Makefile.am b/Makefile.am
index d64fa3c..5e91c8a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
@@ -417,10 +417,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 +426,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 +621,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)