From 67933e68ddca460653f69355306fffd865abc3ec Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 8 Feb 2020 14:41:42 -0800 Subject: build-system/iOS: don't build libdivecomputer inside the source tree Signed-off-by: Dirk Hohndel --- packaging/ios/build.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 63bf1a64e..b57d879f5 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -216,16 +216,16 @@ for ARCH in $ARCHS; do autoreconf --install popd fi - mkdir -p ../../libdivecomputer/build-ios/$ARCH - if [ ! -f ../../libdivecomputer/build-ios/${ARCH}/git.SHA ] ; then - echo "" > ../../libdivecomputer/build-ios/${ARCH}/git.SHA + mkdir -p ${PARENT_DIR}/libdivecomputer-build-ios/$ARCH + if [ ! -f ${PARENT_DIR}/libdivecomputer-build-ios/${ARCH}/git.SHA ] ; then + echo "" > ${PARENT_DIR}/libdivecomputer-build-ios/${ARCH}/git.SHA fi CURRENT_SHA=$(cd ../../libdivecomputer ; git describe) - PREVIOUS_SHA=$(cat ../../libdivecomputer/build-ios/${ARCH}/git.SHA) + PREVIOUS_SHA=$(cat ${PARENT_DIR}/libdivecomputer-build-ios/${ARCH}/git.SHA) if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then - echo $CURRENT_SHA > ../../libdivecomputer/build-ios/${ARCH}/git.SHA - pushd ../../libdivecomputer/build-ios/$ARCH - ../../configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --without-libusb --without-hidapi --enable-ble + echo $CURRENT_SHA > ${PARENT_DIR}/libdivecomputer-build-ios/${ARCH}/git.SHA + pushd ${PARENT_DIR}/libdivecomputer-build-ios/$ARCH + ${SUBSURFACE_SOURCE}/libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --without-libusb --without-hidapi --enable-ble make make install popd -- cgit v1.2.3-70-g09d2