BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Android: Fix minor makefile bugs

Browse Source 
Fix commenting happening thanks to missing quotes and dereference variable the right way,
to get rid of a compile error.
This commit is contained in:
est31 2015-07-29 15:22:51 +02:00
parent ca63f7f10d
commit f97c2702a2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/android/Makefile
View File

@ -699,7 +699,7 @@ $(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB)
for DIRNAME in {builtin,client,doc,fonts,games,mods,po,textures}; do \ 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" "); \ LAST_MODIF=$$(find ${ROOT}/../../${DIRNAME} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
if [ $$(basename $$LAST_MODIF) != "timestamp" ]; then \ if [ $$(basename $$LAST_MODIF) != "timestamp" ]; then \
touch ${ROOT}/../../$DIRNAME/timestamp; \ touch ${ROOT}/../../${DIRNAME}/timestamp; \
touch ${ASSETS_TIMESTAMP}; \ touch ${ASSETS_TIMESTAMP}; \
echo ${DIRNAME} changed $$LAST_MODIF; \ echo ${DIRNAME} changed $$LAST_MODIF; \
fi; \ fi; \
@ -855,8 +855,8 @@ manifest :
DBG_FLAG="android:debuggable=\"true\""; \ DBG_FLAG="android:debuggable=\"true\""; \
fi; \ fi; \
cat ${ROOT}/AndroidManifest.xml.template | \ cat ${ROOT}/AndroidManifest.xml.template | \
sed s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g | \ sed "s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g" | \
sed s/###BASE_VERSION###/$$BASE_VERSION/g | \ sed "s/###BASE_VERSION###/$$BASE_VERSION/g" | \
sed -e "s@###DEBUG_BUILD###@$$DBG@g" | \ sed -e "s@###DEBUG_BUILD###@$$DBG@g" | \
sed -e "s@###DEBUG_FLAG###@$$DBG_FLAG@g" >${ROOT}/AndroidManifest.xml sed -e "s@###DEBUG_FLAG###@$$DBG_FLAG@g" >${ROOT}/AndroidManifest.xml