From c39c4a50c81f98483589aaf4e490dadaa39ab1a0 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Fri, 20 Nov 2009 12:53:42 +0000 Subject: [PATCH] Fix some dependencies in bindists We can't depend on sources in a bindist, because we don't have the sources. --- docs/users_guide/ghc.mk | 3 +++ rules/docbook.mk | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/docs/users_guide/ghc.mk b/docs/users_guide/ghc.mk index ceb6db4..4c8dc1b 100644 --- a/docs/users_guide/ghc.mk +++ b/docs/users_guide/ghc.mk @@ -29,5 +29,8 @@ src_ug_book = $(dir $(realpath $(dir $(build_ug_book))/ug-book.xml.in))ug-book. ifneq "$(build_ug_book)" "$(src_ug_book)" $(src_ug_book) : $(build_ug_book) "$(CP)" $< $@ +ifneq "$(BINDIST)" "YES" docs/users_guide/users_guide.pdf docs/users_guide/users_guide.ps: $(src_ug_book) endif +endif + diff --git a/rules/docbook.mk b/rules/docbook.mk index 9b8a4f1..922574e 100644 --- a/rules/docbook.mk +++ b/rules/docbook.mk @@ -29,6 +29,7 @@ $(call all-target,$1,html_$1) html_$1 : $1/$2/index.html +ifneq "$$(BINDIST)" "YES" $1/$2/index.html: $$($1_DOCBOOK_SOURCES) "$$(RM)" $$(RM_OPTS) -r $$(dir $$@) "$$(XSLTPROC)" --stringparam base.dir $$(dir $$@) \ @@ -39,6 +40,7 @@ $1/$2/index.html: $$($1_DOCBOOK_SOURCES) $$(XSLTPROC_HTML_STYLESHEET) \ $1/$2.xml cp mk/fptools.css $$(dir $$@) +endif INSTALL_HTML_DOC_DIRS += $1/$2 else @@ -53,8 +55,10 @@ $(call all-target,$1,ps_$1) ps_$1 : $1/$2.ps +ifneq "$$(BINDIST)" "YES" $1/$2.ps: $$($1_DOCBOOK_SOURCES) "$$(DBLATEX)" $$(DBLATEX_OPTS) $1/$2.xml --ps -o $$@ +endif INSTALL_DOCS += $1/$2.ps else @@ -69,8 +73,10 @@ $(call all-target,$1,pdf_$1) .PHONY: pdf_$1 pdf_$1 : $1/$2.pdf +ifneq "$$(BINDIST)" "YES" $1/$2.pdf: $$($1_DOCBOOK_SOURCES) "$$(DBLATEX)" $$(DBLATEX_OPTS) $1/$2.xml --pdf -o $$@ +endif INSTALL_DOCS += $1/$2.pdf else -- 1.7.10.4