X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=e3f1b4a8fb745c35f417e64f1fd5f435646da487;hb=979defae5a58c840a6d24cc6cfceae8d1de6f3ec;hp=a65d89861aa60c3bb1154ed94c44db297e1e9615;hpb=3e0f2190bc123f8bb0482fdba3327a04409de7f5;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index a65d898..e3f1b4a 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -99,6 +99,9 @@ endif
 %.hs : %.ly
 	$(HAPPY) $(HAPPY_OPTS) $<
 
+%.hs : %.y
+	$(HAPPY) $(HAPPY_OPTS) $<
+
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
 #
@@ -113,10 +116,10 @@ endif
 .PRECIOUS: %.gc
 
 %.hs : %.gc
-	$(GREENCARD) $(GREENCARD_OPTS) $< -o $@
+	$(GREENCARD) $(GC_OPTS) $< -o $@
 
 %.lhs : %.gc
-	$(GREENCARD) $(GREENCARD_OPTS) $< -o $@
+	$(GREENCARD) $(GC_OPTS) $< -o $@
 
 %.gc : %.pgc
 	$(CPP) $(GC_CPP_OPTS) $< | perl -pe 's#\\n#\n#g' > $@
@@ -195,10 +198,6 @@ endif
 #-----------------------------------------------------------------------------
 # SGML suffix rules
 #
-%.sgml : %.vsgml
-	@$(RM) $@
-	expand $< | $(SGMLVERB) > $@
-
 %.dvi : %.sgml
 	@$(RM) $@
 	$(SGML2DVI) $(SGML2DVI_OPTS) $<
@@ -213,7 +212,10 @@ endif
 
 %.html : %.tex
 	@$(RM) $@
-	$(LATEX2HTML) $(LATEX2HTML_OPTS) $<
+	$(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
+	$(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
+	$(HACHA) $(HACHA_OPTS) $(patsubst %.tex,%.html,$<)
+# Run HeVeA twice to resolve labels
 
 %.rtf : %.sgml
 	@$(RM) $@