diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Doc/Makefile.in | 2 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | Test/Makefile.in | 2 |
4 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a2193c18e..5f914a0d1 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> * 15606: Completion/Unix/Command/_dd: add exclusion lists diff --git a/Doc/Makefile.in b/Doc/Makefile.in index 6d07a0a68..b8e198bd2 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 fc2e1544d..2e14b99ea 100644 --- a/Test/Makefile.in +++ b/Test/Makefile.in @@ -42,7 +42,7 @@ 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)/$(TESTNUM)*.ztst; do \ |