MAKE during pbulk scan

[Sean Boudreau <seanb%qnx.com@localhost>]

Hi:

I've been playing with the pbulk stuff.  When operating
in master mode I get stuff like the following from the
clients.  Turns out MAKE is not set correctly in the
client bmake(s).  Attached is a suggested diff.

Thanks,

-seanb


Scanning...
..........sh: bmake: cannot execute - No such file or
directory
bmake: "../../mk/../../mk/pkg-build-options.mk" line 31:
warning: "echo "";  /home/pbulk/pkg/sbin/pkg_info -K
/home/pbulk/pkg/var/db/pkg -Q PKG_OPTIONS gtk2 2>/dev/null
|| { cd ../../x11/gtk2  && bmake OPSYS=QNX OS_VERSION=6.4.0
LOWER_ARCH=i386 LOWER_OPSYS=qnx
_PKGSRCDIR=/net/pkgsrc.ott.qnx.com/fs/hd0-qnx6-2/home/seanb/svn/community/pkgsrc/HEAD_640/pkgsrc
PKGTOOLS_VERSION=20081002 show-var VARNAME=PKG_OPTIONS; }"
returned non-zero status                  sh: bmake: cannot
execute - No such file or directory

Index: pkgtools/pbulk/files/pbulk/pscan/pscan.c
===================================================================
--- pkgtools/pbulk/files/pbulk/pscan/pscan.c    (revision 122)
+++ pkgtools/pbulk/files/pbulk/pscan/pscan.c    (working copy)
@@ -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 @@
                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 @@
 scan_pkglocation(const char *pkg_location)
 {
        const char * extract_pbulk_index[] = {
-               bmake_cmd,
+               bmake_path,
                "pbulk-index",
                NULL
        };
@@ -194,7 +187,7 @@
 find_full_tree(void)
 {
        const char * extract_subdir[] = {
-               bmake_cmd,
+               bmake_path,
                "show-subdir-var",
                "VARNAME=SUBDIR",
                NULL