diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-05-14 01:08:48 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-05-14 01:08:48 +0100 |
| commit | ff1a16a0bd630f97dc507f96977eaaae9d8df9a6 (patch) | |
| tree | 1396eed617fa2f380c7b2139cdf89f80fb2b9bbb /rules | |
| parent | b8447a93b36d19f4c1dd81881ff10adf8c781fbe (diff) | |
| download | haskell-ff1a16a0bd630f97dc507f96977eaaae9d8df9a6.tar.gz | |
Simplify ghc-cabal
It now consistently takes directory and distDirectory as its first 2
arguments. Also, it only supports configuring 1 package at a time now
(we weren't using the ability to configure more than one at once).
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 2 | ||||
| -rw-r--r-- | rules/haddock.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 6582d18ab5..c66825ed56 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -107,7 +107,7 @@ ifneq "$$($1_NO_CHECK)" "YES" "$$(ghc-cabal_INPLACE)" check $1 endif endif - "$$(ghc-cabal_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1 + "$$(ghc-cabal_INPLACE)" configure $1 $2 --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) ifeq "$$($1_$2_PROG)" "" ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO" $$(call cmd,$1_$2_GHC_PKG) update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config diff --git a/rules/haddock.mk b/rules/haddock.mk index bd4b994276..78f4ea6e18 100644 --- a/rules/haddock.mk +++ b/rules/haddock.mk @@ -45,7 +45,7 @@ ifneq "$$(BINDIST)" "YES" # so we don't want to expand it yet. $$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) : $$$$(haddock_INPLACE) $$$$(ghc-cabal_INPLACE) $$($1_$2_HS_SRCS) $$$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_DEPS) | $$$$(dir $$$$@)/. ifeq "$$(HSCOLOUR_SRCS)" "YES" - "$$(ghc-cabal_INPLACE)" hscolour $2 $1 + "$$(ghc-cabal_INPLACE)" hscolour $1 $2 endif "$$(TOP)/$$(INPLACE_BIN)/haddock" \ --odir="$1/$2/doc/html/$$($1_PACKAGE)" \ |