From f93092f9c537cdeed37ad28a1e509d0d04459289 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 16 Oct 2010 12:34:21 +0000 Subject: [PATCH] Correct the regexp used to search for extra packages We weren't ignoring comment lines --- rules/extra-packages.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/extra-packages.mk b/rules/extra-packages.mk index 271bc6d..1cef9ad 100644 --- a/rules/extra-packages.mk +++ b/rules/extra-packages.mk @@ -27,7 +27,7 @@ # add P to the list of packages define extra-packages -$$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ ]\+ \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+ \+[^ ]\+' packages | sed 's/ .*//'))),\ +$$(foreach p,$$(patsubst libraries/%,%,$$(wildcard $$(shell grep '^[^ #][^ ]* \+\(dph\|extra\) \+[^ ]\+ \+[^ ]\+ \+[^ ]\+' packages | sed 's/ .*//'))),\ $$(if $$(wildcard libraries/$$p/ghc-packages),\ $$(eval BUILD_DIRS += libraries/$$p) \ $$(foreach q,$$(shell cat libraries/$$p/ghc-packages2),$$(eval $$(call extra-package,$$p,$$p/$$q))),\ -- 1.7.10.4