From 2f7dc066ab1812a945c1cd6bc7b9a3e3011432b8 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 4 May 2010 22:50:35 +0000 Subject: [PATCH] In build system, call package-config after including package data Otherwise the $1_$2_HC_OPTS variable gets clobbered. --- rules/build-package.mk | 4 ++-- rules/build-prog.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rules/build-package.mk b/rules/build-package.mk index f8c4813..9d1629d 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -80,12 +80,12 @@ endif # --- CONFIGURATION -$(call package-config,$1,$2,$3) - ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" include $1/$2/package-data.mk endif +$(call package-config,$1,$2,$3) + ifeq "$$($1_$2_DISABLE)" "YES" ifeq "$$(DEBUG)" "YES" diff --git a/rules/build-prog.mk b/rules/build-prog.mk index ebc8990..9674bf6 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -49,14 +49,14 @@ define build-prog-helper $(call all-target,$1,all_$1_$2) -$(call package-config,$1,$2,$3) - ifeq "$$($1_USES_CABAL)" "YES" ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" include $1/$2/package-data.mk endif endif +$(call package-config,$1,$2,$3) + ifeq "$$($1_USES_CABAL)$$($1_$2_VERSION)" "YES" $1_$2_DISABLE = YES endif -- 1.7.10.4