X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=984c311ef43c9b6aa0d9a2f7a5f38470bea68157;hb=d7d596d039b48dec6b71df9c4bca0d12958ecdb9;hp=ad238ed9135a6a363d87bbc814dc54cd570c6ee9;hpb=41b8c26ecd239f7cff41d92ea483dad91a1912d2;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index ad238ed..984c311 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -22,10 +22,6 @@
 
 .DELETE_ON_ERROR:
 
-# This line prevents GNU make from deleting any intermediate targets:
-
-.SECONDARY:
-
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
@@ -277,7 +273,15 @@ endif
 		    $(XSLTPROC_OPTS) \
 		    $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
 
-# TODO: Detect hhc via autoconf
+%-htmlhelp2/collection.HxC : %.xml
+	$(RM) -rf $(dir $@)
+	$(XSLTPROC) --stringparam base.dir $(dir $@) \
+		    --stringparam use.id.as.filename 1 \
+		    --stringparam manifest.in.base.dir 1 \
+		    $(XSLTPROC_OPTS) \
+		    $(DIR_DOCBOOK_XSL)/htmlhelp2/htmlhelp2.xsl $<
+
+# TODO: Detect hhc & Hxcomp via autoconf
 #
 # Two obstacles here:
 #
@@ -290,6 +294,9 @@ endif
 %.chm : %-htmlhelp/index.html
 	( cd $(dir $<) && if hhc htmlhelp.hhp ; then false ; else true ; fi ) || true
 
+%.HxS : %-htmlhelp2/collection.HxC
+	( cd $(dir $<) && if Hxcomp -p collection.HxC -o ../$@ ; then false ; else true ; fi )
+
 %.fo : %.xml
 	$(XSLTPROC) --output $@ \
 		    --stringparam draft.mode no \