From c0832b6ffdfb5c62af6f7a41f4a143d6cc61bb3e Mon Sep 17 00:00:00 2001
From: Bart Schaefer <barts@users.sourceforge.net>
Date: Sun, 12 Aug 2001 19:42:45 +0000
Subject: Peter Breitenlohner: Minor tweaks to some make targets.

---
 ChangeLog        |  6 ++++++
 Doc/Makefile.in  |  2 +-
 Makefile.in      |  3 +++
 Test/Makefile.in | 10 +++++-----
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a9fd613b9..15c47815f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-12  Bart Schaefer  <schaefer@zsh.org>
+
+	* Peter Breitenlohner: 14956: Makefile.in, Doc/Makefile.in,
+	Test/Makefile.in: Fix various interactions of DESTDIR and use of
+	multiple build targets, e.g. "make DESTDIR=/tmp all check info".
+
 2001-08-09  Oliver Kiddle  <opk@zsh.org>
 
 	* 15599: Completion/Unix/Command/_user_admin: detect redhat or
diff --git a/Doc/Makefile.in b/Doc/Makefile.in
index 16d0fe740..db47cd25f 100644
--- a/Doc/Makefile.in
+++ b/Doc/Makefile.in
@@ -271,7 +271,7 @@ install.info: texi
 	); 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 --git a/Makefile.in b/Makefile.in
index 58b8ffcd0..db5f5ab48 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,6 +53,9 @@ prep:
 META-FAQ: FORCE
 	@cd Doc && $(MAKE) $(MAKEDEFS) ../META-FAQ
 
+dvi ps html info:
+	@cd Doc && $(MAKE) $(MAKEDEFS) $@
+
 # ========== DEPENDENCIES FOR INSTALLING ==========
 
 # install stripped
diff --git a/Test/Makefile.in b/Test/Makefile.in
index 4b68755a5..2e14b99ea 100644
--- a/Test/Makefile.in
+++ b/Test/Makefile.in
@@ -42,20 +42,20 @@ INSTALL         = @INSTALL@
 
 check test:
 	if test -n "$(DLLD)"; then \
-	  cd $(dir_top) && \
+	  cd $(dir_top) && DESTDIR= \
 	  $(MAKE) MODDIR=`pwd`/$(subdir)/Modules install.modules > /dev/null; \
 	fi
-	for f in $(sdir)/*.ztst; do \
-	  $(dir_top)/Src/zsh -f $(sdir)/ztst.zsh $$f; \
+	-for f in $(sdir)/$(TESTNUM)*.ztst; do \
+	  $(dir_top)/Src/zsh +Z -f $(sdir)/ztst.zsh $$f; \
 	done
-	rm -rf Modules
+	rm -rf Modules .zcompdump
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
 
 @CLEAN_MK@
 
 mostlyclean-here:
-	rm -rf *.tmp
+	rm -rf Modules .zcompdump *.tmp
 
 distclean-here:
 	rm -f Makefile
-- 
cgit 1.4.1