From: Elan Ruusamäe <glen@pld-linux.org>
Date: Tue, 4 Jan 2011 16:11:28 +0000 (+0000)
Subject: - you want to quote the args with spaces, also support shell env of xxxFLAGS
X-Git-Tag: auto/ti/rpm-build-macros-1_600-1~3
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-macros.git;a=commitdiff_plain;h=974b020487cd5917b44f48d8906ec45c5d8d29c9

- you want to quote the args with spaces, also support shell env of xxxFLAGS

Changed files:
    rpm.macros -> 1.599
---

diff --git a/rpm.macros b/rpm.macros
index fc29208..ad18aad 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -259,9 +259,9 @@ LDFLAGS="${LDFLAGS:-%{rpmldflags}}" \\\
 	-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
 	-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
 	-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-	-DCMAKE_CXX_FLAGS=%{rpmcxxflags} \\\
-	-DCMAKE_CPP_FLAGS=%{rpmcppflags} \\\
-	-DCMAKE_C_FLAGS=%{rpmcflags} \\\
+	-DCMAKE_CXX_FLAGS="${CXXFLAGS:-%{rpmcxxflags}" \\\
+	-DCMAKE_CPP_FLAGS="${CPPFLAGS:-%{rpmcppflags}}" \\\
+	-DCMAKE_C_FLAGS="${CFLAGS:-%{rpmcflags}}" \\\
 %if "%{_lib}" == "lib64" \
 	-DLIB_SUFFIX=64 \\\
 %endif \