From: David Levine Date: Sat, 5 May 2012 15:05:36 +0000 (-0500) Subject: Check for success of hard links of bin files. If they fail, try sym X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=f51d08573e0b5ee447c03bd83547ed252103354c;p=mmh Check for success of hard links of bin files. If they fail, try sym links. 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. Fallback to cp -p, though might not be needed, just in case. --- diff --git a/MACHINES b/MACHINES index 2f25e91..ba36863 100644 --- a/MACHINES +++ b/MACHINES @@ -20,8 +20,12 @@ Known Compilation problems: -------------------------------------- Cygwin: -Be sure to install Cygwin packages libncurses-devel and libncurses10, -in the Libs category. +Be sure to install these Cygwin packages: + gdbm + libgdbm4 + libgdbm-devel + libncurses10 + libncurses-devel -------------------------------------- HPUX: @@ -71,12 +75,14 @@ a better solution. The whole thing is probablly going to be chucked with UTF-8 support anyway. Other than the warnings, it builds ok. + -------------------------------------- SunOS 4.1.1/4.1.3/4.1.4: You can't use the C compiler that comes with SunOS 4 since it isn't ANSI C. But nmh builds just fine with gcc. With --enable-debug you will see a lot of warnings. + -------------------------------------- -- diff --git a/Makefile.am b/Makefile.am index adf3f89..bacc263 100644 --- a/Makefile.am +++ b/Makefile.am @@ -224,7 +224,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 +414,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 +427,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); \