- few more

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index f4ca3849dd70e7157c77d6c78244ba010ce8ce7e..b6f613aeb2cac9266f2ca33a97c1ca875cf4bbad 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} \
@@ -131,6 +131,9 @@ done \
 # Example files, programs, scripts...
 %_examplesdir  /usr/src/examples
 
+# The directory holding Linux kernel sources
+%_kernelsrcdir /usr/src/linux
+
 # If non-empty "debug" macro defined, add "dbg" suffix to release number
 %_rpmfilename          %%{NAME}-%%{VERSION}-%%{RELEASE}%{?debug:dbg}.%%{ARCH}.rpm
 
@@ -238,5 +241,3 @@ fi \
 #%_noautoreqdep                %{nil}
 #%_noautoprovfiles     %{nil}
 #%_noautoprov          %{nil}
-
-