From f97c2702a2fee9496059169448ce97ed2b7da9b2 Mon Sep 17 00:00:00 2001 From: est31 Date: Wed, 29 Jul 2015 15:22:51 +0200 Subject: [PATCH] Android: Fix minor makefile bugs Fix commenting happening thanks to missing quotes and dereference variable the right way, to get rid of a compile error. --- build/android/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/android/Makefile b/build/android/Makefile index 612fb50e..b8719954 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -699,7 +699,7 @@ $(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB) for DIRNAME in {builtin,client,doc,fonts,games,mods,po,textures}; do \ LAST_MODIF=$$(find ${ROOT}/../../${DIRNAME} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \ if [ $$(basename $$LAST_MODIF) != "timestamp" ]; then \ - touch ${ROOT}/../../$DIRNAME/timestamp; \ + touch ${ROOT}/../../${DIRNAME}/timestamp; \ touch ${ASSETS_TIMESTAMP}; \ echo ${DIRNAME} changed $$LAST_MODIF; \ fi; \ @@ -855,8 +855,8 @@ manifest : DBG_FLAG="android:debuggable=\"true\""; \ fi; \ cat ${ROOT}/AndroidManifest.xml.template | \ - sed s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g | \ - sed s/###BASE_VERSION###/$$BASE_VERSION/g | \ + sed "s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g" | \ + sed "s/###BASE_VERSION###/$$BASE_VERSION/g" | \ sed -e "s@###DEBUG_BUILD###@$$DBG@g" | \ sed -e "s@###DEBUG_FLAG###@$$DBG_FLAG@g" >${ROOT}/AndroidManifest.xml