- fixed CPPFLAGS in %%configure

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

diff --git a/rpm.macros b/rpm.macros
index 7b32ba8e138496847741eff4b4775b85f5b524d5..c42587f6bcbe5d38758c1426ccdf183e3bb2da15 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -26,8 +26,16 @@
 %rpmldflags    %{!?debug:-s}
 
 # kernel compiler
-%kgcc          kgcc
-%kgcc_package  egcs
+%kgcc          gcc
+%kgcc_package  gcc
+
+#-----------------------------------------------------------------
+# Build system path macros.
+#
+%__libtoolize           libtoolize --copy --force
+%__gettextize           gettextize --copy --force
+%__automake             automake -a -c -f --foreign
+%__autoconf             autoconf %{?debug:-Wall}
 
 #-----------------------------------------------------------------
 %configure2_13 { \
@@ -62,7 +70,7 @@
        CFLAGS="${CFLAGS:-%rpmcflags}" \
        CXXFLAGS="${CXXFLAGS:-%rpmcflags}" \
        FFLAGS="${FFLAGS:-%rpmcflags}" \
-       CPPFLAGS="${CPPFLAGS:-%rpmcflags}" \
+       CPPFLAGS="${CPPFLAGS:-}" \
        %{?__cc:CC=%{__cc}} \
        %{?__cxx:CXX=%{__cxx}} \
        --build=%{_target_platform} \