From 6de288ad4c7db0f1a13121a09beae25102fcded3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jurko=20Gospodneti=C4=87?= <jurko.gospodnetic@pke.hr>
Date: Sat, 5 Jan 2008 20:06:15 +0000
Subject: [PATCH] Cleaned up where the stage module is imported in
 tools/builtin.jam. Added a missing import in tools/stage.jam that causes
 errors with the previous fix. Minor stylistic changes in tools/stage.jam.

[SVN r42495]
---
 v2/tools/builtin.jam |  4 +---
 v2/tools/stage.jam   | 26 +++++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index 678a18611..0d4286734 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -21,6 +21,7 @@ import project ;
 import property ;
 import regex ;
 import scanner ;
+import stage ;
 import symlink ;
 import type ;
 import utility ;
@@ -372,9 +373,6 @@ class searched-lib-target : abstract-file-target
 }
 
 
-import stage ;
-
-
 class c-scanner : scanner
 {
     import path ;
diff --git a/v2/tools/stage.jam b/v2/tools/stage.jam
index acb806cd0..47561286e 100644
--- a/v2/tools/stage.jam
+++ b/v2/tools/stage.jam
@@ -16,14 +16,18 @@ import feature ;
 import project ;
 import virtual-target ;
 import path ;
+import types/register ;
 
-feature.feature <install-dependencies> : off on : incidental ;
-feature.feature <install-type> : : free incidental ;
-feature.feature <install-source-root> : : free path  ;
-# If 'on', version symblinks for shared libraries won't be created
-# This feature has effect only on Unix.
+
+feature.feature <install-dependencies> : off on : incidental      ;
+feature.feature <install-type>         :        : free incidental ;
+feature.feature <install-source-root>  :        : free path       ;
+feature.feature <so-version>           :        : free incidental ;
+
+# If 'on', version symlinks for shared libraries won't be created. Affects Unix
+# builds only.
 feature.feature <install-no-version-symlinks> : on : optional incidental ;
-feature.feature <so-version> : : free incidental ;
+
 
 class install-target-class : basic-target
 {
@@ -339,8 +343,8 @@ rule relink-file ( project : source : property-set  )
 }
 
 
-# Declare installed version of the EXE type. Generator for this type will
-# cause relinking to the new location.
+# Declare installed version of the EXE type. Generator for this type will cause
+# relinking to the new location.
 type.register INSTALLED_EXE : : EXE ;
 
 class installed-exe-generator : generator
@@ -374,8 +378,8 @@ class installed-exe-generator : generator
 generators.register [ new installed-exe-generator ] ;
 
 
-# Installing shared link on Unix might cause a creation of
-# versioned symbolic links.
+# Installing a shared link on Unix might cause a creation of versioned symbolic
+# links.
 type.register INSTALLED_SHARED_LIB : : SHARED_LIB ;
 
 class installed-shared-lib-generator : generator
@@ -471,7 +475,7 @@ class installed-shared-lib-generator : generator
 generators.register [ new installed-shared-lib-generator ] ;
 
 
-# Main target rule for 'install'
+# Main target rule for 'install'.
 rule install ( name : sources * : requirements * : default-build * )
 {
     local project = [ project.current ] ;