X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-package-data.mk;h=3a4db89170bed5f93eb64aec51b49bcaed6bc17e;hb=19e299bbfa64f239999c23baa7fe42530a157393;hp=38a9620e33f0b10f4ce51f4bdb90d1ed27c36de9;hpb=4e340bbb54087a3a5b12afc6e2ad3664ec4beed3;p=ghc-hetmet.git diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 38a9620..3a4db89 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -24,9 +24,9 @@ endif # for our build system, and registers the package for use in-place in # the build tree. $1/$2/package-data.mk $1/$2/inplace-pkg-config $1/$2/build/autogen/cabal_macros.h : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$($1_$2_HC_CONFIG_DEP) - $$(GHC_CABAL_INPLACE) configure --with-ghc=$$($1_$2_HC_CONFIG) --with-ghc-pkg=$$($1_$2_GHC_PKG) --with-gcc=$$(WhatGccIsCalled) --configure-option=--with-cc=$$(WhatGccIsCalled) $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1 + "$$(GHC_CABAL_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" --with-gcc="$$(WhatGccIsCalled)" --configure-option=--with-cc="$$(WhatGccIsCalled)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1 if [ "$$($1_$2_PROG)" = "" ]; then \ - $$($1_$2_GHC_PKG) update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config; \ + "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config; \ fi endef