diff options
Diffstat (limited to 'build/install')
| -rw-r--r-- | build/install/module.cxx | 16 | ||||
| -rw-r--r-- | build/install/rule.cxx | 5 |
2 files changed, 3 insertions, 18 deletions
diff --git a/build/install/module.cxx b/build/install/module.cxx index 610154a..5bf2876 100644 --- a/build/install/module.cxx +++ b/build/install/module.cxx @@ -63,7 +63,7 @@ namespace build if (spec) { - if (cv != nullptr && *cv && !cv->empty ()) + if (*cv && !cv->empty ()) v = *cv; } else @@ -116,19 +116,9 @@ namespace build // r.operations.insert (install_id, install); - // Register rules. + // Register our file installer rule. // - { - auto& rs (b.rules); - - // Register the standard alias rule for the install operation. - // - rs.insert<alias> (install_id, "alias", alias_rule::instance); - - // Register our file installer rule. - // - rs.insert<file> (install_id, "install", rule_); - } + b.rules.insert<file> (perform_id, install_id, "install", rule_); // Enter module variables. // diff --git a/build/install/rule.cxx b/build/install/rule.cxx index 8f67001..b1627be 100644 --- a/build/install/rule.cxx +++ b/build/install/rule.cxx @@ -61,11 +61,6 @@ namespace build if (!mr.bvalue) // Not installable. return noop_recipe; - // In case of install, we don't do anything for other meta-operations. - // - if (a.operation () == install_id && a.meta_operation () != perform_id) - return noop_recipe; - // Ok, if we are here, then this means: // // 1. This target is installable. |