X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-prog.mk;h=0efac4c039618b59b82bfbd6c51a025547c7b124;hb=c9bb6b63aa1f479a3dd3679c7e4c2c69471a4912;hp=9674bf602baf8e0ad1b1e43a25f571ff1bb52d5b;hpb=2f7dc066ab1812a945c1cd6bc7b9a3e3011432b8;p=ghc-hetmet.git

diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 9674bf6..0efac4c 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -50,6 +50,10 @@ define build-prog-helper
 $(call all-target,$1,all_$1_$2)
 
 ifeq "$$($1_USES_CABAL)" "YES"
+$1_$2_USES_CABAL = YES
+endif
+
+ifeq "$$($1_$2_USES_CABAL)" "YES"
 ifneq "$$(NO_INCLUDE_PKGDATA)" "YES"
 include $1/$2/package-data.mk
 endif
@@ -57,7 +61,7 @@ endif
 
 $(call package-config,$1,$2,$3)
 
-ifeq "$$($1_USES_CABAL)$$($1_$2_VERSION)" "YES"
+ifeq "$$($1_$2_USES_CABAL)$$($1_$2_VERSION)" "YES"
 $1_$2_DISABLE = YES
 endif
 
@@ -92,7 +96,7 @@ $(call c-sources,$1,$2)
 
 $1_$2_depfile_base = $1/$2/build/.depend
 
-$(call build-dependencies,$1,$2)
+$(call build-dependencies,$1,$2,$3)
 
 # --- IMPLICIT RULES