X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FMakefile;h=9c8da7dc899115463ef3892afad22e14d89a3805;hb=c004ec62b41aa2137b5b5e298ca562609b0de92e;hp=fa6d4a557bb9d56612711c388a96637f6446aa30;hpb=f4629357f3eb3714955fc3f8ac81440123e7caf4;p=ghc-hetmet.git

diff --git a/compiler/Makefile b/compiler/Makefile
index fa6d4a5..9c8da7d 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -271,7 +271,6 @@ endif
 	@echo "cUSER_WAY_NAMES       = \"$(USER_WAY_NAMES)\"" >> $(CONFIG_HS)
 	@echo "cUSER_WAY_OPTS        = \"$(USER_WAY_OPTS)\"" >> $(CONFIG_HS)
 	@echo "cDEFAULT_TMPDIR       = \"$(DEFAULT_TMPDIR)\"" >> $(CONFIG_HS)
-	@echo "cDocDir               = \"$(docdir)\""         >> $(CONFIG_HS)
 ifeq "$(RelocatableBuild)" "YES"
 	@echo "cRelocatableBuild     = True"                  >> $(CONFIG_HS)
 else
@@ -845,7 +844,7 @@ VERSION = $(ProjectVersion)
 PKG_DEPENDS += base haskell98
 # We have to expand each package dependency with its version, which we
 # can do by calling "ghc-pkg list $pkg --simple-output".
-PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(foreach pkg,$(PKG_DEPENDS),$(shell $(GHC_PKG_INPLACE) list $(pkg) --simple-output))'
+PACKAGE_CPP_OPTS += -DPKG_DEPENDS='$(foreach pkg,$(PKG_DEPENDS),$(shell $(GHC_PKG_INPLACE) latest --global $(pkg)))'
 PACKAGE_CPP_OPTS += -DSTAGE='"$(stage)"'
 
 # Omit Main from the library, the client will want to plug their own Main in