- added %ifarch for PPC port of PLD :)

[packages/rpm.git] / rpm.macros

diff --git a/rpm.macros b/rpm.macros
index fb7214925ccce4d8a0521195c39453a3bf04ba03..c4c5b061d17b9c10efd31c462e4baaedb51fd578 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -32,6 +32,8 @@
  CFLAGS="${CFLAGS:-%rpmcflags}" ; export CFLAGS ; \
  CXXFLAGS="${CXXFLAGS:-%rpmcflags}" ; export CXXFLAGS ; \
  FFLAGS="${FFLAGS:-%rpmcflags}" ; export FFLAGS ; \
+ %{?__cc:CC=%{__cc} ; export CC ; } \
+ %{?__cxx:CXX=%{__cxx} ; export CXX ; } \
  ./configure \
        --host=%{_target_platform} \
        --prefix=%{_prefix} \
@@ -176,7 +178,7 @@ if [ "$_autoreqprov" = "y" ] ; then \
 fi \
 %{nil}
 
-%__spec_install_post \
+%__os_install_post \
 %{?_noautoreqfiles:for f in %{_noautoreqfiles} ; do echo %{?buildroot:%{buildroot}}$f >> %{_builddir}/__rpm_noautoreqfiles ; done }\
 %{?_noautoreq:for f in %{_noautoreq} ; do echo "$f" >> %{_builddir}/__rpm_noautoreq ; done }\
 %{?_noautoreqdep:for f in %{_noautoreqdep} ; do echo "$f" >> %{_builddir}/__rpm_noautoreqdep ; done }\
@@ -185,7 +187,6 @@ fi \
 %{__spec_install_post_strip}\
 %{__spec_install_post_compress_docs}\
 %{__arch_install_post}\
-%{__os_install_post}\
 %{nil}
 
 %__spec_clean_pre      %{___build_pre}\