From 68ae113299dbf2928cf0a8c4400b960620136738 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Wed, 24 Oct 2012 17:49:42 +0100 Subject: Make it possible to build with only way dyn --- ghc.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ghc.mk') diff --git a/ghc.mk b/ghc.mk index aa700a658e..cdf306946c 100644 --- a/ghc.mk +++ b/ghc.mk @@ -143,6 +143,7 @@ endif include rules/prof.mk include rules/trace.mk +include rules/library-path.mk include rules/make-command.mk include rules/pretty_commands.mk @@ -480,6 +481,7 @@ utils/ghc-pkg/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/hsc2hs/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/compare_sizes/dist-install/package-data.mk: compiler/stage2/package-data.mk utils/runghc/dist-install/package-data.mk: compiler/stage2/package-data.mk +utils/mkUserGuidePart/dist/package-data.mk: compiler/stage2/package-data.mk # add the final package.conf dependency: ghc-prim depends on RTS libraries/ghc-prim/dist-install/package-data.mk : rts/package.conf.inplace @@ -1027,7 +1029,7 @@ unix-binary-dist-prep: echo "BUILD_DOCBOOK_PS = $(BUILD_DOCBOOK_PS)" >> $(BIN_DIST_MK) echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK) - echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK) + echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist" >> $(BIN_DIST_MK) cd $(BIN_DIST_PREP_DIR) && autoreconf $(call removeFiles,$(BIN_DIST_PREP_TAR)) # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source -- cgit v1.2.1