From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 May 2011 07:11:53 +0000 (-0700)
Subject: Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS
X-Git-Tag: v1.7.6-rc0~18^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a80dff25152f43e8a9a688943cb5f67d2ad76fc4;p=git.git

Makefile: Pass USE_LIBPCRE down in GIT-BUILD-OPTIONS

Otherwise we would fail to rebuild correctly when this option was
changed between $(MAKE) invocations, and more importantly, $(MAKE) test
would not pass it down and t/test-lib.sh would not set the LIBPCRE
prerequisite.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index fea55c04d..c449f5d6d 100644
--- a/Makefile
+++ b/Makefile
@@ -2109,6 +2109,7 @@ GIT-BUILD-OPTIONS: FORCE
 	@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@
 	@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
 	@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
+	@echo USE_LIBPCRE=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE)))'\' >>$@
 	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
 	@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
 ifdef GIT_TEST_CMP