diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-14 19:40:46 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-14 19:40:46 +0100 |
| commit | cf53aff5d6feebf06953794b03b1793cda3e2f77 (patch) | |
| tree | 7007ec3309cf29392ab978fb6f2519a86678c966 /scripts | |
| parent | 093c542e059b733e0207ce072679c2267339b860 (diff) | |
| parent | bc561e500e22bc9d953fd9a80144f80295a4cbbd (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
update Xorg / Mesa
Conflicts:
TODO
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/install.sh | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index ab4ac8635..7c93a12a3 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash #- -# Copyright © 2010, 2011 +# Copyright © 2010-2014 # Waldemar Brodkorb <wbx@openadk.org> # Thorsten Glaser <tg@mirbsd.org> # @@ -32,25 +32,14 @@ # • create a cfgfs partition TOPDIR=$(pwd) +HOST=$(gcc -dumpmachine) me=$0 case :$PATH: in -(*:$TOPDIR/bin/tools:*) ;; -(*) export PATH=$PATH:$TOPDIR/bin/tools ;; +(*:$TOPDIR/host_$HOST/usr/bin:*) ;; +(*) export PATH=$PATH:$TOPDIR/host_$HOST/usr/bin ;; esac -test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then - make package=mksh fetch || exit 1 - df=$(cd package/mksh; TOPDIR="$TOPDIR" gmake show=DISTFILES) - mkdir -p build_mksh - gzip -dc dl/"$df" | (cd build_mksh; cpio -mid) - cd build_mksh/mksh - bash Build.sh -r -c lto || exit 1 - cp mksh "$TOPDIR"/bin/tools/ - cd "$TOPDIR" - rm -rf build_mksh -fi - test -n "$KSH_VERSION" || exec mksh "$me" "$@" if test -z "$KSH_VERSION"; then echo >&2 Fatal error: could not run myself with mksh! |