Update of /cvsroot/boost/boost/tools/build/v2/build
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv6748/build
Modified Files:
Tag: RC_1_34_0
generators.jam
Log Message:
Merge from trunk
Index: generators.jam
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/build/generators.jam,v
retrieving revision 1.96.2.3
retrieving revision 1.96.2.4
diff -u -d -r1.96.2.3 -r1.96.2.4
--- generators.jam 23 May 2006 14:22:46 -0000 1.96.2.3
+++ generators.jam 8 Jun 2006 05:32:10 -0000 1.96.2.4
@@ -105,7 +105,6 @@
import virtual-target ;
import "class" : new ;
import property ;
- import path ;
EXPORT [EMAIL PROTECTED] : indent increase-indent decrease-indent
generators.dout ;
@@ -415,20 +414,8 @@
}
}
- # See if we need to add directory to the target name.
- local dir = [ $(sources[1]).name ] ;
- dir = $(dir:D) ;
- if $(dir) &&
- # Never append '..' to target path.
- ! [ MATCH .*(\\.\\.).* : $(dir) ]
- &&
- ! [ path.is-rooted $(dir) ]
- {
- # Relative path is always relative to the source
- # directory. Retain it, so that users can have files
- # with the same in two different subdirectories.
- name = $(dir)/$(name) ;
- }
+ # Names of sources might include directory. We should strip it.
+ name = $(name:D=) ;
}
# Assign an action for each target
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
