- don't change CFLAGS,CXXFLAGS,LDFLAGS,FFLAGS if already set

Changed files:
    rpm.macros -> 1.10

diff --git a/rpm.macros b/rpm.macros
index 2150f28a4e0e1fef39fc4fd19a3157c56a151e74..b675f7c543a9c445bf3abd809bec13f1900d780a 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -12,8 +12,8 @@
 # Based on autogen.sh from GNOME and orginal GNUconfigure
 #
 %GNUconfigure(MCs:)      \
-  CFLAGS="${CFLAGS} %{optflags}" ; export CFLAGS; \
-  LDFLAGS="${LDFLAGS} %{-s:-s}"  ; export LDFLAGS; \
+  CFLAGS="$(CFLAGS:-%{optflags})" ; export CFLAGS; \
+  LDFLAGS="$(LDFLAGS:-%{-s:-s}"  ; export LDFLAGS; \
   %{-C:_mydir="`pwd`"; %{-M: %{__mkdir} -p %{-C*};} cd %{-C*}} \
   dirs="`find ${_mydir} -name configure.in -print`"; export dirs; \
     for coin in `echo ${dirs}` \
@@ -58,9 +58,9 @@ done \
   %{-C:cd ${_mydir}; unset _mydir}
 
 #-----------------------------------------------------------------
-%configure { CFLAGS="$CFLAGS $RPM_OPT_FLAGS" ; export CFLAGS ; \
- CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" ; export CXXFLAGS ; \
- FFLAGS="$FFLAGS $RPM_OPT_FLAGS" ; export FFLAGS ; \
+%configure { CFLAGS="$(CFLAGS:-$RPM_OPT_FLAGS)" ; export CFLAGS ; \
+ CXXFLAGS="$(CXXFLAGS:-$RPM_OPT_FLAGS)" ; export CXXFLAGS ; \
+ FFLAGS="$(FFLAGS:-$RPM_OPT_FLAGS)" ; export FFLAGS ; \
  ./configure %{_target_platform} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \