Index: Jamfile.v2
===================================================================
RCS file: /cvsroot/boost/boost/Jamfile.v2,v
retrieving revision 1.40
diff -u -r1.40 Jamfile.v2
--- Jamfile.v2	16 Oct 2006 21:38:03 -0000	1.40
+++ Jamfile.v2	21 Oct 2006 10:30:02 -0000
@@ -142,6 +142,11 @@
       # Used to encode variant in target name. See the
       # 'tag' rule below.
       <tag>@$(__name__).tag
+      # This property combination is impossible on gcc.
+      # Until we have a more general mechanism for
+      # toolset to declare impossible properties,
+      # just hardcode this knowledge here
+      <toolset>gcc,<link>shared,<runtime-link>static:<build>no
     : usage-requirements <include>.
     : build-dir bin.v2
     : default-build $(default-build)
@@ -281,7 +286,7 @@
     ;
 
 local header-subdir ;
-if $(layout-versioned) { header-subdir = boost-$(BOOST_VERSION_TAG) ; }
+if $(layout-versioned) { header-subdir = boost-$(BOOST_VERSION_TAG)/boost ; }
 else { header-subdir = boost ; }