Commit Diff


commit - 363062eab4dfbd7d484862fe35b73962caa635ef
commit + 89ec3cde42c7b1bb44e6a7b39f73dbec5e892d04
blob - 7d4b75941c0f7167f6957cb2354f52368a50162c
blob + 414fa9b3c4055a2a415f6135645a81c91320ce0b
--- CONTRIBUTORS
+++ CONTRIBUTORS
@@ -22,6 +22,7 @@ Mathieu Lonjaret <mathieu.lonjaret@gmail.com>
 Michael Teichgräber <mt4swm@googlemail.com>
 Michael Teichgräber <mt@ib.wmipf.de>
 Nikolai Saoukh <nikolai.saoukh@gmail.com>
+Peter Saveliev <svinota.saveliev@gmail.com>
 Richard Miller <millerresearch@gmail.com>
 Rob Pike <robpike@gmail.com>
 Russ Cox <rsc@swtch.com>
blob - 4a175d8d8eacd9fe0c8633d405343238c9be14a8
blob + 5f18e28fd077f6d9bb7c5d33ee9fb53d421372b2
--- INSTALL
+++ INSTALL
@@ -14,8 +14,12 @@ x-c)
 	dobuild=false
 	doinstall=true
 	;;
+x-r)
+    shift
+    PLAN9_TARGET=$1 export PLAN9_TARGET
+    ;;
 *)
-	echo 'usage: INSTALL [-b | -c]' 1>&2
+	echo 'usage: INSTALL [-b | -c] [-r path]' 1>&2
 	exit 1
 esac
 
blob - b294839f327029bee3211e58ee61818ee34f0738
blob + b22801958a685d5ce3946aea26ea9dbe74974fbd
--- lib/moveplan9.sh
+++ lib/moveplan9.sh
@@ -12,7 +12,9 @@ case $# in
 	exit 1
 esac
 
-new=`cleanname $PLAN9`
+[ -z "$PLAN9_TARGET" ] && PLAN9_TARGET="$PLAN9"
+new=`cleanname $PLAN9_TARGET`
+
 if [ X"$new" = X"" ]
 then
 	echo cleanname failed 1>&2
blob - c7afc54c1fb5c849a89480e08262a5cb59589325
blob + 43ac8aa0e6133ffcb5e7c52a36a799a209f3f345
--- man/man1/install.1
+++ man/man1/install.1
@@ -8,6 +8,9 @@ cd \*9; ./INSTALL
 .B -b
 |
 .B -c
+] [
+.B -r
+.I path
 ]
 .SH DESCRIPTION
 To obtain the Plan 9 tree, use Mercurial
@@ -56,6 +59,13 @@ flag,
 performs only the second step.
 The first step can be done with the tree in a temporary work directory,
 but the second step must be done once the tree is in its final location.
+If you want to build the project in one location and then install into
+another location, use
+.B -r
+.I path
+to specify the
+.I final
+location of Plan9 tree.
 These flags are only necessary when trying to conform to the
 expectations of certain package management systems.
 .PP