diff options
Diffstat (limited to 'bpkg/pkg-configure.cxx')
| -rw-r--r-- | bpkg/pkg-configure.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/bpkg/pkg-configure.cxx b/bpkg/pkg-configure.cxx index c839d42..aaa426f 100644 --- a/bpkg/pkg-configure.cxx +++ b/bpkg/pkg-configure.cxx @@ -127,16 +127,9 @@ namespace bpkg ? *p->src_root : c / *p->src_root); - const repository_location& rl (p->repository); - - // For external packages call the output directory <pkg>, rather than - // <pkg>-<ver>. - // - dir_path out_root ( - (!rl.empty () && rl.directory_based ()) || // pkg-unpack <name>/<version> - ( rl.empty () && !p->archive) // pkg-unpack --existing <dir> - ? c / dir_path (p->name) - : c / dir_path (p->name + "-" + p->version.string ())); + dir_path out_root (p->external () + ? c / dir_path (p->name) + : c / dir_path (p->name + "-" + p->version.string ())); l4 ([&]{trace << "src_root: " << src_root << ", " << "out_root: " << out_root;}); |