X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=5ac15fbcd29b41ece104809f8e7eb78507e7e67d;hb=aa9c98eccad321f97953330e7d4931a68ed0550e;hp=fa76355f0668ba9c6094b16f81d03f78eb619de4;hpb=be0242d094f9b3091b15f200ac9d978576b7b681;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index fa76355..5ac15fb 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -156,13 +156,6 @@ ifneq "$(BootingFromHc)" "YES"
 endif
 
 #-----------------------------------------------------------------------------
-# Lx Suffix Rules
-#
-
-%.hs : %.lx
-	$(LX) $(LX_OPTS) $<
-
-#-----------------------------------------------------------------------------
 # Green-card Suffix Rules
 #
 
@@ -269,8 +262,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 +364,5 @@ endif
 
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< > $@
+	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< | \
+	grep -v '^#pragma GCC' > $@