X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fdocbook.mk;h=cec0f2c449dab61dd3303a1ce5c9fb50a957faa8;hb=79324024325fd2e966427faef770ac96c3c60c70;hp=922574e577bab2feff18ea0aca419695826df5db;hpb=c39c4a50c81f98483589aaf4e490dadaa39ab1a0;p=ghc-hetmet.git

diff --git a/rules/docbook.mk b/rules/docbook.mk
index 922574e..cec0f2c 100644
--- a/rules/docbook.mk
+++ b/rules/docbook.mk
@@ -26,12 +26,14 @@ $(call all-target,$1,)
 
 ifeq "$$(BUILD_DOCBOOK_HTML)" "YES"
 $(call all-target,$1,html_$1)
+INSTALL_HTML_DOC_DIRS += $1/$2
+endif
 
 html_$1 : $1/$2/index.html
 
 ifneq "$$(BINDIST)" "YES"
 $1/$2/index.html: $$($1_DOCBOOK_SOURCES)
-	"$$(RM)" $$(RM_OPTS) -r $$(dir $$@)
+	"$$(RM)" $$(RM_OPTS_REC) $$(dir $$@)
 	"$$(XSLTPROC)" --stringparam base.dir $$(dir $$@) \
 	               --stringparam use.id.as.filename 1 \
 	               --stringparam html.stylesheet fptools.css \
@@ -42,16 +44,12 @@ $1/$2/index.html: $$($1_DOCBOOK_SOURCES)
 	cp mk/fptools.css $$(dir $$@)
 endif
 
-INSTALL_HTML_DOC_DIRS += $1/$2
-else
-html_$1 :
-	@echo "*** HTML documentation is disabled; BUILD_DOCBOOK_HTML = NO"
-	@exit 1
-endif
 
 .PHONY: ps_$1
 ifeq "$$(BUILD_DOCBOOK_PS)" "YES"
 $(call all-target,$1,ps_$1)
+INSTALL_DOCS += $1/$2.ps
+endif
 
 ps_$1 : $1/$2.ps
 
@@ -60,15 +58,10 @@ $1/$2.ps: $$($1_DOCBOOK_SOURCES)
 	"$$(DBLATEX)" $$(DBLATEX_OPTS) $1/$2.xml --ps -o $$@
 endif
 
-INSTALL_DOCS += $1/$2.ps
-else
-ps_$1 :
-	@echo "*** PS documentation is disabled; BUILD_DOCBOOK_PS = NO"
-	@exit 1
-endif
-
 ifeq "$$(BUILD_DOCBOOK_PDF)" "YES"
 $(call all-target,$1,pdf_$1)
+INSTALL_DOCS += $1/$2.pdf
+endif
 
 .PHONY: pdf_$1
 pdf_$1 : $1/$2.pdf
@@ -78,12 +71,5 @@ $1/$2.pdf: $$($1_DOCBOOK_SOURCES)
 	"$$(DBLATEX)" $$(DBLATEX_OPTS) $1/$2.xml --pdf -o $$@
 endif
 
-INSTALL_DOCS += $1/$2.pdf
-else
-pdf_$1 :
-	@echo "*** PDF documentation is disabled; BUILD_DOCBOOK_PDF = NO"
-	@exit 1
-endif
-
 endef