summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary V. Vaughan <git@mlists.thewrittenword.com>2010-05-14 09:31:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-31 23:59:26 (GMT)
commitebef82776512f56eec4b6ac98b076369eb5a93fa (patch)
treea9e8bd817caa7f8ebc55ed24f831d1172b7a0cd0
parentd599e0484f8ebac8cc50e9557a4c3d246826843d (diff)
downloadgit-ebef82776512f56eec4b6ac98b076369eb5a93fa.zip
git-ebef82776512f56eec4b6ac98b076369eb5a93fa.tar.gz
git-ebef82776512f56eec4b6ac98b076369eb5a93fa.tar.bz2
Makefile: pass CPPFLAGS through to fllow customization
Without this patch there is no straight forward way to pass additional CPPFLAGS at configure-time. At TWW, everything non-vendor package is installed to its own subdirectory, so we need the following to show the preprocessor where the headers for the libraries we will link later can be found: $SHELL ./configure \ CPPFLAGS="-I${SB_VAR_CURL_INC}\ -I${SB_VAR_LIBEXPAT_INC}\ -I${SB_VAR_LIBZ_INC}\ ${CPPFLAGS+ $CPPFLAGS}" <<...>> Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile2
-rw-r--r--config.mak.in1
2 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 910f471..da0cfda 100644
--- a/Makefile
+++ b/Makefile
@@ -246,7 +246,7 @@ endif
CFLAGS = -g -O2 -Wall
LDFLAGS =
-ALL_CFLAGS = $(CFLAGS)
+ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
ALL_LDFLAGS = $(LDFLAGS)
STRIP ?= strip
diff --git a/config.mak.in b/config.mak.in
index 6008ac9..7eb6f59 100644
--- a/config.mak.in
+++ b/config.mak.in
@@ -3,6 +3,7 @@
CC = @CC@
CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
CC_LD_DYNPATH = @CC_LD_DYNPATH@
AR = @AR@