%%configure renamed to %%configure2_13, %%configure2_50 to %%configure; allow .....

Changed files:
    rpm.macros -> 1.53

diff --git a/rpm.macros b/rpm.macros
index f4ca3849dd70e7157c77d6c78244ba010ce8ce7e..284dfc3e20d8dc4a9f6de548f30e83fd72d8bd63 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -6,7 +6,7 @@
 %rpmldflags    %{!?debug:-s}
 
 #-----------------------------------------------------------------
-%configure { \
+%configure2_13 { \
  if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
  LDFLAGS="${LDFLAGS:-%rpmldflags}" ; export LDFLAGS ; \
  CFLAGS="${CFLAGS:-%rpmcflags}" ; export CFLAGS ; \
@@ -30,13 +30,13 @@
 }
 
 #----------------------------------------------------------------
-%configure2_50 { \
- if [ -n "$LINGUAS" ]; then unset LINGUAS; fi; \
- ./configure \
+%configure {./configure \
        LDFLAGS="${LDFLAGS:-%rpmldflags}" \
        CFLAGS="${CFLAGS:-%rpmcflags}" \
        CXXFLAGS="${CXXFLAGS:-%rpmcflags}" \
        FFLAGS="${FFLAGS:-%rpmcflags}" \
+       %{?__cc:CC=%{__cc}} \
+       %{?__cxx:CXX=%{__cxx}} \
        --build=%{_target_platform} \
        --prefix=%{_prefix} \
        --exec-prefix=%{_exec_prefix} \