2
0
mirror of https://github.com/boostorg/build.git synced 2026-02-16 01:12:13 +00:00

Allow for building RPMs on newer RedHat's which have the split tools rpm+rpmbuild.

[SVN r19919]
This commit is contained in:
Rene Rivera
2003-09-04 15:01:07 +00:00
parent 77a5c8447d
commit df33ee7f46
2 changed files with 4 additions and 4 deletions

View File

@@ -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
}

View File

@@ -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
}