From 0701db125eb32ed0a518d962c9e4ee279e3296fd Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Mon, 20 Jun 2016 09:02:34 +0200 Subject: Updates to handle new Cabal Specifically per-component macros and multiple libraries. Contains Cabal submodule update. Signed-off-by: Edward Z. Yang Test Plan: validate Reviewers: austin, bgamari Reviewed By: austin, bgamari Subscribers: hvr, thomie Differential Revision: https://phabricator.haskell.org/D2059 --- rules/build-package-data.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rules/build-package-data.mk') diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 89b742c613..e340c8bd43 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -113,7 +113,7 @@ $1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)") ifneq "$$(BINDIST)" "YES" ifneq "$$(NO_GENERATED_MAKEFILE_RULES)" "YES" $1/$2/inplace-pkg-config : $1/$2/package-data.mk -$1/$2/build/autogen/cabal_macros.h : $1/$2/package-data.mk +$1/$2/build/$$(or $$($1_EXECUTABLE),$$($1_$2_PROGNAME),.)/autogen/cabal_macros.h : $1/$2/package-data.mk # This rule configures the package, generates the package-data.mk file # for our build system, and registers the package for use in-place in -- cgit v1.2.1