From ff09365cd014900b5d767116ac51a59403ddb68d Mon Sep 17 00:00:00 2001 From: OttoLidenbrock Date: Fri, 15 May 2015 20:49:54 +1000 Subject: [PATCH] Remove usage of pushd/popd from android makefile so Debian can work (assuming zip is installed) --- build/android/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index f979d2551..b109c7de7 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -666,10 +666,10 @@ assets : $(ASSETS_TIMESTAMP) ls -R | grep ":$$" | sed -e 's/:$$//' -e 's/\.//' -e 's/^\///' > "index.txt"; \ find MultiCraft >"filelist.txt"; \ cp ${ROOT}/${ASSETS_TIMESTAMP} ${ROOT}/${ASSETS_TIMESTAMP}.old; \ - pushd ${ROOT}/assets/MultiCraft; \ + cd ${ROOT}/assets/MultiCraft; \ echo "Creating Files.zip"; \ zip -r -X -q ../Files.zip *; \ - popd; \ + cd ${ROOT}/assets; \ else \ echo "nothing to be done for assets"; \ fi