From 5d9d1b1020b5d7f5fe11d81eb641197bb98819d9 Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Wed, 18 Jun 2014 16:29:37 -0500 Subject: [PATCH] Partial revamp of `scripts/crosscompile` Fix #430. --- scripts/crosscompile | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/crosscompile b/scripts/crosscompile index b307e6d..8d88bb2 100755 --- a/scripts/crosscompile +++ b/scripts/crosscompile @@ -22,16 +22,21 @@ plat="$1" [ -z "$plat" ] && exit 1 shift +case "$plat" in +*/*) echo "platform name must not be a path"; exit 1;; +*..*) echo "platform name must not be a path"; exit 1;; +*) plat=$PWD/$plat;; +esac + [ -d "$plat" ] || mkdir "$plat" rm -rf "$plat/tmp" mkdir "$plat/tmp" cd "$plat/tmp" -mkdir install_other -../../../configure \ - --prefix="`pwd`/install_other" \ - --bindir="`pwd`/.." \ - "$@" -make "$jobs" install-binaries -cd .. +../../../configure "$@" +make "$jobs" DESTDIR=$plat install +set -x +for jq in `find . -type f \( -name jq -o -name jq.exe \) -print`; do + cp "$jq" .. +done rm -rf tmp -- 2.40.0