zsh-4.0.1 -- some minor build/install problems

[Peter Breitenlohner <peb@xxxxxxxxxxxx>]

Hi,

please apply the enclosed patch to zsh-4.0.1 (zsh-4.0.1.tar.gz as of
01 Jun 2001) in order to fix some (minor) build/install problems. The patch
contains small changes to 3 files:

1. zsh-4.0.1/Test/Makefile.in:

without the patch "make DESTDIR=some_where check" rather badly fails.
Why would I want to use "DESTDIR=some_where" together with "make check"?
Seen in isolation this admittedly doesn't make much sense, nevertheless
"make check" shouldn't fail. Consider, however,
"make DESTDIR=some_where all check install"

2. zsh-4.0.1/Makefile.in:

without the patch I had to say
	"make all; make -C Doc info" as user
and	"make install install.info" as root
instead of the more natural "make all info".
You might say that "make install.info" will build the info pages in any
case. True, but when the build tree is on an nfs-mounted filesystem, root may
not have write permission.

3. zsh-4.0.1/Doc/Makefile.in:

without the patch "make DESTDIR=some_where install.info" produces some weird
messages (in my case zsh.info from zsh-3.0.5 had no 'INFO-DIR-SECTION', or
there may not be any /usr/local/info/zsh.info at all).

===============================

Please reply directly to me since I am not a subscriber of this list.

best regards
Peter Breitenlohner <peb@xxxxxxxxxxxx>

diff -ur zsh-4.0.1.orig/Doc/Makefile.in zsh-4.0.1/Doc/Makefile.in
--- zsh-4.0.1.orig/Doc/Makefile.in	Fri Jun  1 16:43:42 2001
+++ zsh-4.0.1/Doc/Makefile.in	Sat Jun  9 22:05:55 2001
@@ -271,7 +271,7 @@
 	); then \
 	    if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
 	      install-info --dir-file=$(DESTDIR)$(infodir)/dir \
-	        $(infodir)/$(tzsh).info; \
+	        $(DESTDIR)$(infodir)/$(tzsh).info; \
 	    else true; fi; \
 	    rm -rf infodir; \
 	    exit 0; \
diff -ur zsh-4.0.1.orig/Makefile.in zsh-4.0.1/Makefile.in
--- zsh-4.0.1.orig/Makefile.in	Mon May 21 12:53:22 2001
+++ zsh-4.0.1/Makefile.in	Sat Jun  9 21:51:44 2001
@@ -53,6 +53,9 @@
 META-FAQ: FORCE
 	@cd Doc && $(MAKE) $(MAKEDEFS) ../META-FAQ
 
+dvi ps html info:
+	@cd Doc && $(MAKE) $(MAKEDEFS) $@
+
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install stripped
diff -ur zsh-4.0.1.orig/Test/Makefile.in zsh-4.0.1/Test/Makefile.in
--- zsh-4.0.1.orig/Test/Makefile.in	Wed Feb 14 12:41:51 2001
+++ zsh-4.0.1/Test/Makefile.in	Sat Jun  9 16:52:52 2001
@@ -43,7 +43,7 @@
 check test:
 	if test -n "$(DLLD)"; then \
 	  cd $(dir_top) && \
-	  $(MAKE) MODDIR=`pwd`/$(subdir)/Modules install.modules > /dev/null; \
+	  $(MAKE) DESTDIR= MODDIR=`pwd`/$(subdir)/Modules install.modules > /dev/null; \
 	fi
 	-for f in $(sdir)/$(TESTNUM)*.ztst; do \
 	  $(dir_top)/Src/zsh +Z -f $(sdir)/ztst.zsh $$f; \