X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fpackage.mk;h=ce90aec9ce2387bbc8367b712a0cfe8038922798;hp=ea2d3b2ab9446d538bc3985ee04cf36301bddade;hb=143f4381d242e4a1c3174e8a0732a1e48f00a1aa;hpb=956293b3f44d493bb55c5fb569d94824c4b6fe45

diff --git a/mk/package.mk b/mk/package.mk
index ea2d3b2..ce90aec 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -119,8 +119,8 @@ boot all :: $(STAMP_PKG_CONF)
 endif
 
 $(STAMP_PKG_CONF) : package.conf.inplace package.conf.installed
-	$(GHC_PKG_INPLACE) --force --update-package <package.conf.inplace
-	$(GHC_PKG_INPLACE)  -f $(GHC_DRIVER_DIR)/package.conf --force --update-package <package.conf.installed
+	$(GHC_PKG_INPLACE) update - --force-files <package.conf.inplace
+	$(GHC_PKG_INPLACE) update - -f $(GHC_DRIVER_DIR)/package.conf --force-files <package.conf.installed
 	@touch $(STAMP_PKG_CONF)
 
 CLEAN_FILES += package.conf.installed package.conf.inplace 
@@ -153,20 +153,20 @@ SRC_HSC2HS_OPTS += -I.
 
 ifeq "$(STANDALONE_PACKAGE)" "NO"
 HC = $(GHC_INPLACE)
-IGNORE_PACKAGE_FLAG = -ignore-package
+IGNORE_PACKAGE_FLAG = -package-name  $(PACKAGE)-$(VERSION)
 else
 # Only use -ignore-package if supported by HC; i.e., ghc-6.3 and later.
 # (Don't like the use of slow $(shell ..) in Makefiles, but can't see a way around it here.)
 ifeq "$(strip $(GHC))" ""
-IGNORE_PACKAGE_FLAG = -ignore-package
+IGNORE_PACKAGE_FLAG = -ignore-package $(PACKAGE)
 else
 # Making the assumption here that standalone packages will be using mk/config.mk:GHC
-IGNORE_PACKAGE_FLAG = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi)
+IGNORE_PACKAGE_FLAG = $(shell if (test $(GhcCanonVersion) -ge 603); then echo "-ignore-package"; else echo "-package-name"; fi) $(PACKAGE)
 endif 
 endif # STANDALONE_PACKAGE
 
 ifeq "$(NON_HS_PACKAGE)" ""
-SRC_HC_OPTS	+= $(IGNORE_PACKAGE_FLAG) $(PACKAGE)
+SRC_HC_OPTS	+= $(IGNORE_PACKAGE_FLAG)
 SRC_HC_OPTS 	+= $(GhcLibHcOpts)
 SRC_HC_OPTS     += $(patsubst %, -package %, $(PACKAGE_DEPS))
 endif
@@ -356,7 +356,7 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES"
 
 HS_PPS = $(addsuffix .raw-hs, $(basename $(filter-out $(EXCLUDED_HADDOCK_SRCS), $(HS_SRCS)))) $(EXTRA_HADDOCK_SRCS)
 
-HTML_DIR = ../html/$(PACKAGE)
+HTML_DIR = ../html-docs/$(PACKAGE)
 HTML_DOC = $(HTML_DIR)/haddock.css $(HTML_DIR)/haddock.js
 
 ifneq "$(HS_PPS)" ""
@@ -387,10 +387,10 @@ $(HTML_DOC) : $(HS_PPS)
 CLEAN_FILES += $(PACKAGE).haddock
 
 %.raw-hs : %.lhs
-	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
 
 %.raw-hs : %.hs
-	$(HC) $(HC_OPTS) -D__HADDOCK__ -E -optP-P $< -o $@
+	$(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
 
 HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
 #  NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on