X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=2714c34077cc1a636d47e07bb5e1512ae9a2afd4;hb=0d52a0a134871d317b5f8b53a952c882ce5ae5b6;hp=7fa1e8a81b72330036ef2463a29780a4c70c4878;hpb=a1939730ba7a460d702aca22322c4ec558e8be6d;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 7fa1e8a..2714c34 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -250,7 +250,7 @@ endif
 		    $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
 	cp $(FPTOOLS_CSS_ABS) .
 
-%-html/index.html : %.xml
+%/index.html : %.xml
 	$(RM) -rf $(dir $@)
 	$(XSLTPROC) --stringparam base.dir $(dir $@) \
 		    --stringparam use.id.as.filename 1 \
@@ -269,8 +269,17 @@ endif
 		    $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
 
 # TODO: Detect hhc via autoconf
+#
+# Two obstables here:
+#
+# * The reason for the strange "if" below is that hhc returns 0 on error and 1
+#   on success, the opposite of what shells and make expect.
+#
+# * There seems to be some trouble with DocBook indices, but the *.chm looks OK,
+#   anyway, therefore we pacify make by "|| true". Ugly...
+#
 %.chm : %-htmlhelp/index.html
-	( cd $(dir $<) && hhc htmlhelp.hhp )
+	( cd $(dir $<) && if hhc htmlhelp.hhp ; then false ; else true ; fi ) || true
 
 %.fo : %.xml
 	$(XSLTPROC) --output $@ \
@@ -362,4 +371,5 @@ endif
 
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< > $@
+	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< | \
+	grep -v '^#pragma GCC' > $@