selfinstall: Fix self install in Makefile and install.sh

We were doing `npm install -g` on `make install` and in the `install.sh`
bootstrapper, which now makes a symlink.  This updates it to go back to
creating a global copy.

Fixes: #17554
Fixes: #17377
Fixes: #16916

Credit: @iarna
Reviewed-By: @zkat
PR-URL: npm/npm#17626

Makefile

@@ -56,7 +56,7 @@ latest:
 	node bin/npm-cli.js install -g -f npm ${NPMOPTS}
 
 install: all
-	node bin/npm-cli.js install -g -f ${NPMOPTS}
+	node bin/npm-cli.js install -g -f ${NPMOPTS} $(shell node bin/npm-cli.js pack | tail -1)
 
 # backwards compat
 dev: install

scripts/install.sh

@@ -257,7 +257,7 @@ cd "$TMP" \
       fi
       if [ "$make" = "NOMAKE" ]; then
         "$node" bin/npm-cli.js rm npm -gf
-        "$node" bin/npm-cli.js install -gf
+        "$node" bin/npm-cli.js install -gf $("$node" bin/npm-cli.js pack | tail -1)
       fi) \
   && cd "$BACK" \
   && rm -rf "$TMP" \