From f2cb45cd9433ffb57d3913e555f3c7eebcce2c81 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 4 Sep 2003 15:01:07 +0000 Subject: [PATCH] Allow for building RPMs on newer RedHat's which have the split tools rpm+rpmbuild. [SVN r19919] --- src/engine/build.jam | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/build.jam b/src/engine/build.jam index b86ebc33f..16613ca6e 100644 --- a/src/engine/build.jam +++ b/src/engine/build.jam @@ -673,7 +673,7 @@ rule .package ( dst-dir : src-files + ) } # RPM distro file. -rpm-tool = [ GLOB $(PATH) : "rpm" ] ; +rpm-tool = [ GLOB $(PATH) : "rpmbuild" "rpm" ] ; rule .rpm ( name : source ) { local rpm-arch = ; @@ -704,7 +704,7 @@ rule .rpm ( name : source ) actions .rpm. { export BOOST_JAM_DOCS="$(docs)" export BOOST_JAM_TOOLSET="$(toolset)" - rpm -ta $(target-opt)$(arch) $(>) | tee rpm.out + $(rpm-tool[1]) -ta $(target-opt)$(arch) $(>) | tee rpm.out cp `grep -e '^Wrote:' rpm.out | sed 's/^Wrote: //'` . rm -f rpm.out }