boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-11 23:52:20 +00:00
Code Issues Projects Releases Wiki Activity

boostbook.jam; Remove some path.make calls as they are superfluous in the path.glob case.

Browse Source 
path.jam; Kludge path.join into working as it did before when confronted with an initial empty string on the path.


[SVN r31212]
This commit is contained in:
Rene Rivera
2005-10-06 19:47:58 +00:00
parent 3e9e78fe46
commit bc3396ff68
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tools/boostbook.jam
View File

@@ -99,14 +99,8 @@ rule init ( docbook-xsl-dir ? : docbook-dtd-dir ? : boostbook-dir ? )
for local dir in $(search-dirs) {
boostbook-dtd-dir += [ path.glob $(dir) : dtd ] ;
}
if $(boostbook-xsl-dir)
{
.boostbook-xsl-dir = [ path.make $(boostbook-xsl-dir[1]) ] ;
}
if $(boostbook-dtd-dir)
{
.boostbook-dtd-dir = [ path.make $(boostbook-dtd-dir[1]) ] ;
}
.boostbook-xsl-dir = $(boostbook-xsl-dir[1]) ;
.boostbook-dtd-dir = $(boostbook-dtd-dir[1]) ;
if ! $(.boostbook-xsl-dir) || ! $(.boostbook-dtd-dir)

11
src/util/path.jam
View File

@@ -140,7 +140,16 @@ rule reverse ( path )
#
local rule join-imp ( elements + )
{
return [ NORMALIZE_PATH $(elements) ] ;
local result = ;
if ! $(elements[1])
{
result = [ NORMALIZE_PATH "/" "$(elements[2-])" ] ;
}
else
{
result = [ NORMALIZE_PATH "$(elements)" ] ;
}
return $(result) ;
}
#