From 2bfd6519ac33c9ea7640b49c6066519e73e75423 Mon Sep 17 00:00:00 2001 From: debacle Date: Mon, 3 Mar 2008 15:30:28 +0000 Subject: [PATCH] Use $(CURDIR) instead of $(PWD) to make make(1) -C make. git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@4954 313b444b-1b9f-4f58-a734-7bb04f332e8d --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 8b3d358..2622444 100644 --- a/Makefile +++ b/Makefile @@ -34,9 +34,9 @@ TRANSLATE=po4a-translate --format docbook --keep 0 # note: the URL is used as identifier, no HTTP is used! DOCBOOK_XSL=http://docbook.sourceforge.net/release/xsl/current # for HTML output -DBK2HTML=$(PWD)/html.xsl +DBK2HTML=$(CURDIR)/html.xsl # all in one file for text output -DBK2HTML1=$(PWD)/txt.xsl +DBK2HTML1=$(CURDIR)/txt.xsl .PHONY: all all: $(filter-out $(BLACKLIST), $(TARGETS)) @@ -49,12 +49,12 @@ validate: $(SOURCES) cd $(@D) && $(XL) index.dbk .PHONY: developers-reference.html %/developers-reference.html -developers-reference.html: $(PWD)/index.html +developers-reference.html: $(CURDIR)/index.html %/developers-reference.html: $(addprefix %/,index.html) @true .PRECIOUS: %/index.html -index.html: $(PWD)/developers-reference.html +index.html: $(CURDIR)/developers-reference.html %/index.html: $(addprefix %/,$(SOURCES)) cd $(@D) && $(XP) $(DBK2HTML) index.dbk @@ -62,7 +62,7 @@ index.html: $(PWD)/developers-reference.html .PRECIOUS: %.dbk %.ent ifndef LINGUA %.dbk %.ent: FORCE - $(MAKE) $@ LINGUA=$(@D) + $(MAKE) $@ LINGUA=`basename $(@D)` FORCE: else @@ -73,12 +73,12 @@ $(LINGUA)/common.ent: common.ent cd $(@D) && ln -sf ../$(@F) . endif -developers-reference.txt: $(PWD)/developers-reference.txt +developers-reference.txt: $(CURDIR)/developers-reference.txt %/developers-reference.txt: $(addprefix %/,$(SOURCES)) $(XP) $(DBK2HTML1) $(@D)/index.dbk \ | w3m -cols 65 -dump -T text/html > $@ -developers-reference.pdf: $(PWD)/developers-reference.pdf +developers-reference.pdf: $(CURDIR)/developers-reference.pdf %/developers-reference.pdf: $(addprefix %/,$(SOURCES)) TOP=`pwd` && cd $(@D) && $(DBLATEX) index.dbk \ && mv index.dbk.pdf $(@F) -- 2.30.2