diff options
| author | Brent Cook <bcook@openbsd.org> | 2014-07-21 18:56:24 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-07-21 20:27:14 -0500 |
| commit | 451dbd967ca64d229db40dd779154d42e381c525 (patch) | |
| tree | 6b05207df8c4f196339e560d35f2bf396db423c8 | |
| parent | 33bc05ca9ce2f190350738684eee1cd9d1bea9c2 (diff) | |
| download | portable-451dbd967ca64d229db40dd779154d42e381c525.tar.gz portable-451dbd967ca64d229db40dd779154d42e381c525.tar.bz2 portable-451dbd967ca64d229db40dd779154d42e381c525.zip | |
compute absolute paths to source
removes relative path hackery
ok beck@ guenther@
| -rwxr-xr-x | update.sh | 21 |
1 files changed, 11 insertions, 10 deletions
| @@ -14,13 +14,14 @@ else | |||
| 14 | fi | 14 | fi |
| 15 | fi | 15 | fi |
| 16 | 16 | ||
| 17 | libssl_src=openbsd/src/lib/libssl | 17 | dir=`pwd` |
| 18 | libssl_regress=openbsd/src/regress/lib/libssl | 18 | libssl_src=$dir/openbsd/src/lib/libssl |
| 19 | libc_src=openbsd/src/lib/libc | 19 | libssl_regress=$dir/openbsd/src/regress/lib/libssl |
| 20 | libc_regress=openbsd/src/regress/lib/libc | 20 | libc_src=$dir/openbsd/src/lib/libc |
| 21 | libcrypto_src=openbsd/src/lib/libcrypto | 21 | libc_regress=$dir/openbsd/src/regress/lib/libc |
| 22 | openssl_cmd_src=openbsd/src/usr.sbin/openssl | 22 | libcrypto_src=$dir/openbsd/src/lib/libcrypto |
| 23 | libcrypto_regress=openbsd/src/regress/lib/libcrypto | 23 | openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl |
| 24 | libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto | ||
| 24 | 25 | ||
| 25 | libressl_version=`cat VERSION` | 26 | libressl_version=`cat VERSION` |
| 26 | 27 | ||
| @@ -72,7 +73,7 @@ $CP $libc_src/crypt/chacha_private.h crypto/compat | |||
| 72 | $CP $libcrypto_src/crypto/getentropy_*.c crypto/compat | 73 | $CP $libcrypto_src/crypto/getentropy_*.c crypto/compat |
| 73 | $CP $libcrypto_src/crypto/arc4random_*.h crypto/compat | 74 | $CP $libcrypto_src/crypto/arc4random_*.h crypto/compat |
| 74 | 75 | ||
| 75 | (cd ./$libssl_src/src/crypto/objects/; | 76 | (cd $libssl_src/src/crypto/objects/; |
| 76 | perl objects.pl objects.txt obj_mac.num obj_mac.h; | 77 | perl objects.pl objects.txt obj_mac.num obj_mac.h; |
| 77 | perl obj_dat.pl obj_mac.h obj_dat.h ) | 78 | perl obj_dat.pl obj_mac.h obj_dat.h ) |
| 78 | mkdir -p include/openssl crypto/objects | 79 | mkdir -p include/openssl crypto/objects |
| @@ -412,7 +413,7 @@ apps_excludes=( | |||
| 412 | $CP Makefile.am.tpl Makefile.am | 413 | $CP Makefile.am.tpl Makefile.am |
| 413 | for i in crypto,3 ssl,3 apps,1; do | 414 | for i in crypto,3 ssl,3 apps,1; do |
| 414 | IFS=","; set $i; unset IFS | 415 | IFS=","; set $i; unset IFS |
| 415 | for i in `ls -1 ../$libssl_src/src/doc/$1/*.pod | sort`; do | 416 | for i in `ls -1 $libssl_src/src/doc/$1/*.pod | sort`; do |
| 416 | BASE=`echo $i|sed -e "s/\.pod//"` | 417 | BASE=`echo $i|sed -e "s/\.pod//"` |
| 417 | NAME=`basename "$BASE"` | 418 | NAME=`basename "$BASE"` |
| 418 | # reformat file if new | 419 | # reformat file if new |
| @@ -425,7 +426,7 @@ apps_excludes=( | |||
| 425 | done | 426 | done |
| 426 | done | 427 | done |
| 427 | 428 | ||
| 428 | $CP ../$openssl_cmd_src/openssl.1 . | 429 | $CP $openssl_cmd_src/openssl.1 . |
| 429 | echo "dist_man_MANS += openssl.1" >> Makefile.am | 430 | echo "dist_man_MANS += openssl.1" >> Makefile.am |
| 430 | 431 | ||
| 431 | echo "install-data-hook:" >> Makefile.am | 432 | echo "install-data-hook:" >> Makefile.am |
