- fixed CPPFLAGS in %%configure

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

diff --git a/rpm.macros b/rpm.macros
index 05922004b4fc0bee39971eb4f071c0fb373b0d69..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 { \
@@ -36,6 +44,7 @@
  CFLAGS="${CFLAGS:-%rpmcflags}" ; export CFLAGS ; \
  CXXFLAGS="${CXXFLAGS:-%rpmcflags}" ; export CXXFLAGS ; \
  FFLAGS="${FFLAGS:-%rpmcflags}" ; export FFLAGS ; \
+ CPPFLAGS="${CPPFLAGS:-}" ; export CPPFLAGS ; \
  %{?__cc:CC=%{__cc} ; export CC ; } \
  %{?__cxx:CXX=%{__cxx} ; export CXX ; } \
  ./configure \
@@ -61,6 +70,7 @@
        CFLAGS="${CFLAGS:-%rpmcflags}" \
        CXXFLAGS="${CXXFLAGS:-%rpmcflags}" \
        FFLAGS="${FFLAGS:-%rpmcflags}" \
+       CPPFLAGS="${CPPFLAGS:-}" \
        %{?__cc:CC=%{__cc}} \
        %{?__cxx:CXX=%{__cxx}} \
        --build=%{_target_platform} \
@@ -185,6 +195,7 @@ _autoreqprov=n \
 %{?_noautoreqdep:_autoreqprov=y}\
 %{?_noautoprovfiles:_autoreqprov=y}\
 %{?_noautoprov:_autoreqprov=y}\
+%{?_noautocompressdoc:_autoreqprov=y}\
 if [ "$_autoreqprov" = "y" ] ; then \
     if [ -f %{_builddir}/__rpm_lock ] ; then \
        echo "Some package using \%_noauto*  macros is already being built" >&2 \
@@ -195,6 +206,7 @@ if [ "$_autoreqprov" = "y" ] ; then \
        touch %{_builddir}/__rpm_lock \
     fi \
 fi \
+%{?_noautocompressdoc:echo '%{_noautocompressdoc}' > %{_builddir}/__rpm_noautocompressdoc}\
 %{nil}
 
 %__os_install_post \
@@ -216,6 +228,7 @@ _autoreqprov=n \
 %{?_noautoprovfiles:_autoreqprov=y}\
 %{?_noautoprov:_autoreqprov=y}\
 %{?_noautoreqfiles:_autoreqprov=y}\
+%{?_noautocompressdoc:_autoreqprov=y}\
 if [ "$_autoreqprov" = "y" ] ; then \
        rm -f %{_builddir}/__rpm_* \
 fi \