aboutsummaryrefslogtreecommitdiff
path: root/build/install
diff options
context:
space:
mode:
Diffstat (limited to 'build/install')
-rw-r--r--build/install/module.cxx22
1 files changed, 12 insertions, 10 deletions
diff --git a/build/install/module.cxx b/build/install/module.cxx
index 8711341..f8f7d73 100644
--- a/build/install/module.cxx
+++ b/build/install/module.cxx
@@ -121,24 +121,26 @@ namespace build
const dir_path& out_root (r.out_path ());
level5 ([&]{trace << "for " << out_root;});
- // Register the install operation.
- //
- r.operations.insert (install_id, install);
-
- // Register our alias and file installer rule.
- //
- b.rules.insert<alias> (perform_id, install_id, "install.alias", alias_);
- b.rules.insert<file> (perform_id, install_id, "install.file", file_);
-
// Enter module variables.
//
// Note that the set_dir() calls below enter some more.
//
if (first)
{
- var_pool.find ("install", dir_path_type);
+ auto& v (var_pool);
+
+ v.find ("install", dir_path_type);
}
+ // Register the install operation.
+ //
+ r.operations.insert (install_id, install);
+
+ // Register our alias and file installer rule.
+ //
+ b.rules.insert<alias> (perform_install_id, "install.alias", alias_);
+ b.rules.insert<file> (perform_install_id, "install.file", file_);
+
// Configuration.
//
// Note that we don't use any defaults for root -- the location