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

[packages/rpm-build-macros.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index 0ca707b5399ea6b832715be4da113331718651b6..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,8 +58,30 @@ 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 %{_target_platform} --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} }
-  
+%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} \
+       --bindir=%{_bindir} \
+       --sbindir=%{_sbindir} \
+       --sysconfdir=%{_sysconfdir} \
+       --datadir=%{_datadir} \
+       --includedir=%{_includedir} \
+       --libdir=%{_libdir} \
+       --libexecdir=%{_libexecdir} \
+       --localstatedir=%{_localstatedir} \
+       --sharedstatedir=%{_sharedstatedir} \
+       --mandir=%{_mandir} \
+       --infodir=%{_infodir} }
+#------------------------------------------------------------------------  
+# usage 
+# (in %install)
+# %find_lang %{name}
+#
+# %file -f %{name}.lang
+#
+
+%find_lang     @RPMCONFIGDIR@/find-lang.sh %{buildroot}
+