From: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Date: Tue, 6 Feb 2007 19:08:55 +0000 (-0300)
Subject: Call make always with CFLAGS in git.spec
X-Git-Tag: v1.5.0-rc4~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0b2958a8b431b8c7f27bc34fdbe400cb204ede06?ds=inline;hp=-c

Call make always with CFLAGS in git.spec

If not, the binaries get built once with the correct CFLAGS, and then again
with the ones in the Makefile when installing

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

0b2958a8b431b8c7f27bc34fdbe400cb204ede06
diff --git a/git.spec.in b/git.spec.in
index fb95e37594..1213325e57 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -89,7 +89,8 @@ make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_OWN_SUBPROCESS_PY=YesPlease \
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \
+make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
+     WITH_OWN_SUBPROCESS_PY=YesPlease \
      prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \
      install %{!?_without_docs: install-doc}
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'