diff options
| author | seanb <seanb> | 2011-03-06 02:23:32 +0000 |
|---|---|---|
| committer | seanb <seanb> | 2011-03-06 02:23:32 +0000 |
| commit | 2f9e976a6680af493a3e950ccbd334c6d6ec7809 (patch) | |
| tree | a37e6d34370d3b1be647512a75750fea4bc25dde /pkgtools | |
| parent | 866eba63d9a10002557453f924c393805254893d (diff) | |
| download | pkgsrc-2f9e976a6680af493a3e950ccbd334c6d6ec7809.tar.gz | |
- pass fullpath in argv[0] when pkg-scan spawns bmake so that
the same gets inherited across a sub make.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk-base/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/pbulk/files/pbulk/pscan/pscan.c | 13 |
2 files changed, 5 insertions, 12 deletions
diff --git a/pkgtools/pbulk-base/Makefile b/pkgtools/pbulk-base/Makefile index cf270b62707..4e67eb74b44 100644 --- a/pkgtools/pbulk-base/Makefile +++ b/pkgtools/pbulk-base/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2010/05/05 00:07:07 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2011/03/06 02:23:32 seanb Exp $ -DISTNAME= pbulk-base-0.41 +DISTNAME= pbulk-base-0.42 COMMENT= Core components of the modular bulk build framework PKG_DESTDIR_SUPPORT= user-destdir diff --git a/pkgtools/pbulk/files/pbulk/pscan/pscan.c b/pkgtools/pbulk/files/pbulk/pscan/pscan.c index a7d8726b788..c98a4285d2e 100644 --- a/pkgtools/pbulk/files/pbulk/pscan/pscan.c +++ b/pkgtools/pbulk/files/pbulk/pscan/pscan.c @@ -1,4 +1,4 @@ -/* $NetBSD: pscan.c,v 1.6 2009/06/07 17:59:50 joerg Exp $ */ +/* $NetBSD: pscan.c,v 1.7 2011/03/06 02:23:32 seanb Exp $ */ /*- * Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. @@ -51,7 +51,6 @@ int verbosity; static const char *bmake_path; -static const char *bmake_cmd; static const char *output_file; static const char *pkgsrc_tree; @@ -122,12 +121,6 @@ main(int argc, char **argv) usage(); } - bmake_cmd = strrchr(bmake_path, '/'); - if (bmake_cmd == NULL) - bmake_cmd = bmake_path; - else - ++bmake_cmd; - if (client_port) { if (limited_scan != 0 || argc != 1) usage(); @@ -161,7 +154,7 @@ char * scan_pkglocation(const char *pkg_location) { const char * extract_pbulk_index[] = { - bmake_cmd, + bmake_path, "pbulk-index", NULL }; @@ -196,7 +189,7 @@ static void find_full_tree(void) { const char * extract_subdir[] = { - bmake_cmd, + bmake_path, "show-subdir-var", "VARNAME=SUBDIR", NULL |