Land #310, make it easier to build from cvs source

author: Brent Cook <bcook@openbsd.org> 2017-05-08 08:32:38 -0500
committer: Brent Cook <bcook@openbsd.org> 2017-05-08 08:32:38 -0500
commit: f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5 (patch)
tree: c040b91eb3ff9a1000264932f20be6dbdab958f6
parent: 32ab245f05fc0600f3d62f24a1d035d8d7413b72 (diff)
parent: 6cb87c121a04371177f9a226a531b35d1df6afea (diff)
download: portable-f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5.tar.gz
portable-f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5.tar.bz2
portable-f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5.zip
1 files changed, 11 insertions, 10 deletions
diff --git a/update.sh b/update.sh
index aa467f3..9b0d4b5 100755
--- a/update.sh
+++ b/update.sh
@@ -18,16 +18,17 @@ fi
 # setup source paths
 CWD=`pwd`
-libc_src=$CWD/openbsd/src/lib/libc
+OPENBSD_SRC=$CWD/openbsd/src
-libc_regress=$CWD/openbsd/src/regress/lib/libc
+libc_src=$OPENBSD_SRC/lib/libc
-libcrypto_src=$CWD/openbsd/src/lib/libcrypto
+libc_regress=$OPENBSD_SRC/regress/lib/libc
-libcrypto_regress=$CWD/openbsd/src/regress/lib/libcrypto
+libcrypto_src=$OPENBSD_SRC/lib/libcrypto
-libssl_src=$CWD/openbsd/src/lib/libssl
+libcrypto_regress=$OPENBSD_SRC/regress/lib/libcrypto
-libssl_regress=$CWD/openbsd/src/regress/lib/libssl
+libssl_src=$OPENBSD_SRC/lib/libssl
-libtls_src=$CWD/openbsd/src/lib/libtls
+libssl_regress=$OPENBSD_SRC/regress/lib/libssl
-libtls_regress=$CWD/openbsd/src/regress/lib/libtls
+libtls_src=$OPENBSD_SRC/lib/libtls
-bin_src=$CWD/openbsd/src/usr.bin
+libtls_regress=$OPENBSD_SRC/regress/lib/libtls
-sbin_src=$CWD/openbsd/src/usr.sbin
+bin_src=$OPENBSD_SRC/usr.bin
+sbin_src=$OPENBSD_SRC/usr.sbin
 # load library versions
 . $libcrypto_src/shlib_version
author	Brent Cook <bcook@openbsd.org>	2017-05-08 08:32:38 -0500
committer	Brent Cook <bcook@openbsd.org>	2017-05-08 08:32:38 -0500
commit	f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5 (patch)
tree	c040b91eb3ff9a1000264932f20be6dbdab958f6
parent	32ab245f05fc0600f3d62f24a1d035d8d7413b72 (diff)
parent	6cb87c121a04371177f9a226a531b35d1df6afea (diff)
download	portable-f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5.tar.gz portable-f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5.tar.bz2 portable-f494c6aaf71e03bcbd2f9bc08e8e0925fcd650e5.zip

diff --git a/update.sh b/update.sh index aa467f3..9b0d4b5 100755 --- a/update.sh +++ b/update.sh
@@ -18,16 +18,17 @@ fi
18		18
19	# setup source paths	19	# setup source paths
20	CWD=`pwd`	20	CWD=`pwd`
21	libc_src=$CWD/openbsd/src/lib/libc	21	OPENBSD_SRC=$CWD/openbsd/src
22	libc_regress=$CWD/openbsd/src/regress/lib/libc	22	libc_src=$OPENBSD_SRC/lib/libc
23	libcrypto_src=$CWD/openbsd/src/lib/libcrypto	23	libc_regress=$OPENBSD_SRC/regress/lib/libc
24	libcrypto_regress=$CWD/openbsd/src/regress/lib/libcrypto	24	libcrypto_src=$OPENBSD_SRC/lib/libcrypto
25	libssl_src=$CWD/openbsd/src/lib/libssl	25	libcrypto_regress=$OPENBSD_SRC/regress/lib/libcrypto
26	libssl_regress=$CWD/openbsd/src/regress/lib/libssl	26	libssl_src=$OPENBSD_SRC/lib/libssl
27	libtls_src=$CWD/openbsd/src/lib/libtls	27	libssl_regress=$OPENBSD_SRC/regress/lib/libssl
28	libtls_regress=$CWD/openbsd/src/regress/lib/libtls	28	libtls_src=$OPENBSD_SRC/lib/libtls
29	bin_src=$CWD/openbsd/src/usr.bin	29	libtls_regress=$OPENBSD_SRC/regress/lib/libtls
30	sbin_src=$CWD/openbsd/src/usr.sbin	30	bin_src=$OPENBSD_SRC/usr.bin
		31	sbin_src=$OPENBSD_SRC/usr.sbin
31		32
32	# load library versions	33	# load library versions
33	. $libcrypto_src/shlib_version	34	. $libcrypto_src/shlib_version