From fb040bee0710759c60e45bf8fa2a3b8ddcf4212a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kat=20March=C3=A1n?= <kzm@sykosomatic.org>
Date: Sat, 8 Jul 2017 15:20:33 -0700
Subject: npx: bundle npx with npm itself

npx is an npm package runner with a bunch of nice features. While
it is also available on the npm registry as `npx`, it's the sort
of thing that's better off being bundles with npm itself.

Fixes: #6053
PR-URL: https://github.com/npm/npm/pull/17685
Credit: @zkat
Reviewed-By: @iarna
---
 Makefile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5cb67d2d5..53ab16a29 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,8 @@ html_docdeps = html/dochead.html \
 cli_mandocs = $(shell find doc/cli -name '*.md' \
                |sed 's|.md|.1|g' \
                |sed 's|doc/cli/|man/man1/|g' ) \
-               man/man1/npm-README.1
+               man/man1/npm-README.1 \
+               man/man1/npx.1
 
 files_mandocs = $(shell find doc/files -name '*.md' \
                |sed 's|.md|.5|g' \
@@ -96,6 +97,9 @@ man/man1/%.1: doc/cli/%.md scripts/doc-build.sh package.json
 	@[ -d man/man1 ] || mkdir -p man/man1
 	scripts/doc-build.sh $< $@
 
+man/man1/npx.1: node_modules/libnpx/libnpx.1
+	cat $< | sed s/libnpx/npx/ > $@
+
 man/man5/npm-json.5: man/man5/package.json.5
 	cp $< $@
 
-- 
cgit v1.2.3