X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=9dc67d2e6729c9dfa0a5f70613e07ff21b0e1c8a;hb=cea73c10e1c6fd7a874dca190d353f5eac6c7bf6;hp=baebe746fa9c83f53ab72cf66322a5635f6b8198;hpb=d62e0e3b935e0a8172cf7e96c9df0d445f4afb9a;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index baebe74..9dc67d2 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -285,7 +285,9 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
 	   cd $* && setup/Setup makefile -f GNUmakefile; \
 	fi
 
-.PHONY: doc
+.PHONY: doc html
+
+html: doc
 
 doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
 	sh gen_contents_index --inplace
@@ -353,7 +355,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
 	if ifBuildable/ifBuildable $*; then \
 	  cd $* && \
-	  ../installPackage/installPackage '$(GHC_PKG_INPLACE)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
+	  ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
 	fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -393,3 +395,10 @@ binary-dist.library.%:
 	     \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
 	     -exec rm {} \; ; \
 	fi
+
+# Ignore some doc targets that we don't support
+# The root recurses into us when these targets are made
+.PHONY: html-no-chunks chm HxS fo dvi ps pdf
+html-no-chunks chm HxS fo dvi ps pdf:
+	@:
+