From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 844 invoked from network); 10 Feb 2000 17:04:09 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 10 Feb 2000 17:04:09 -0000 Received: (qmail 5355 invoked by alias); 10 Feb 2000 17:03:58 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 9669 Received: (qmail 5347 invoked from network); 10 Feb 2000 17:03:57 -0000 Date: Thu, 10 Feb 2000 17:03:51 +0000 From: Adam Spiers To: zsh workers mailing list Subject: PATCH: Re: duplicate targets in Makefile rule Message-ID: <20000210170351.A19964@thelonious.new.ox.ac.uk> Reply-To: Adam Spiers Mail-Followup-To: zsh workers mailing list References: <20000210153649.A14796@thelonious.new.ox.ac.uk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 1.0pre3i In-Reply-To: X-Home-Page: http://www.new.ox.ac.uk/~adam/ X-OS: Linux 2.2.12 i686 Zefram (zefram@fysh.org) wrote: > $(sdir) is the source tree. man pages and TeXinfo get built in the > source tree, everything else should be in the build tree. Doh, of course. In that case, apply this instead of 9665. Index: Doc/Makefile.in =================================================================== RCS file: /projects/zsh/zsh/Doc/Makefile.in,v retrieving revision 1.1.1.60 diff -u -r1.1.1.60 Makefile.in --- Doc/Makefile.in 2000/02/07 01:59:21 1.1.1.60 +++ Doc/Makefile.in 2000/02/10 16:30:32 @@ -51,7 +51,7 @@ # yodl documentation -YODLDOC = $(MAN) zsh.texi +YODLDOC = $(MAN) texi MODDOCSRC = \ Zsh/mod_cap.yo Zsh/mod_clone.yo \ @@ -73,25 +73,30 @@ # ========== DEPENDENCIES FOR BUILDING ========== -all: $(MAN) zsh.texi ../META-FAQ +all: man texi ../META-FAQ .PHONY: all -everything: all zsh.dvi zsh_us.ps zsh_a4.ps zsh_toc.html +everything: all dvi ps html .PHONY: everything +dvi: zsh.dvi +.PHONY: dvi + zsh.dvi: $(sdir)/zsh.texi - $(TEXI2DVI) $(sdir)/zsh.texi + $(TEXI2DVI) $< -zsh.texi $(sdir)/zsh.texi: - case $@ in \ - */*) target=$@ ;; \ - *) target=$(sdir)/$@ ;; \ - esac; \ - $(YODL) -o $$target -I$(sdir) -w ztexi.yo version.yo zsh.yo; \ - test -f $$target +texi: $(sdir)/zsh.texi +.PHONY: texi + +$(sdir)/zsh.texi: + $(YODL) -o $@ -I$(sdir) -w ztexi.yo version.yo zsh.yo; \ + test -f $@ +info: zsh.info +.PHONY: info + zsh.info: $(sdir)/zsh.texi - $(MAKEINFO) $(sdir)/zsh.texi + $(MAKEINFO) $< .yo.1: case $@ in \ @@ -103,14 +108,26 @@ ;; esac; \ test -f $$target +ps: us_ps a4_ps +.PHONY: ps + +us_ps: zsh_us.ps +.PHONY: us_ps + zsh_us.ps: zsh.dvi - $(DVIPS) -t letter -o $@ zsh.dvi + $(DVIPS) -t letter -o $@ $< +a4_ps: zsh_a4.ps +.PHONY: a4_ps + zsh_a4.ps: zsh.dvi - $(DVIPS) -t a4 -o $@ zsh.dvi + $(DVIPS) -t a4 -o $@ $< + +html: zsh_toc.html +.PHONY: html zsh_toc.html: $(sdir)/zsh.texi - $(TEXI2HTML) $(sdir)/zsh.texi + $(TEXI2HTML) $< zshall.1: zsh.yo case $@ in \ @@ -129,8 +146,11 @@ test -f $(sdir_top)/META-FAQ $(YODLDOC): version.yo + +$(sdir)/zsh.texi: $(YODLSRC) -zsh.texi: $(YODLSRC) +man: $(MAN) +.PHONY: man $(MAN): zmacros.yo zman.yo @@ -225,7 +245,7 @@ .PHONY: uninstall # install man pages, creating install directory if necessary -install.man: $(MAN) +install.man: man $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1 for file in $(MAN); do \ $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1/`echo $$file | sed 's|zsh|$(tzsh)|'` || exit 1; \ @@ -233,7 +253,7 @@ .PHONY: install.man # install info pages, creating install directory if necessary -install.info: zsh.texi +install.info: texi $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) rm -rf infodir mkdir infodir @@ -267,7 +287,7 @@ .PHONY: uninstall.info # install HTML manual -install.html: zsh_toc.html +install.html: html $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) for file in zsh_*.html; do \ $(INSTALL_DATA) $$file $(DESTDIR)$(htmldir) || exit 1; \