Skip to content

Commit f97c270

Browse files
committedJul 29, 2015
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.
1 parent ca63f7f commit f97c270

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed
 

Diff for: ‎build/android/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ $(ASSETS_TIMESTAMP) : $(IRRLICHT_LIB)
699699
for DIRNAME in {builtin,client,doc,fonts,games,mods,po,textures}; do \
700700
LAST_MODIF=$$(find ${ROOT}/../../${DIRNAME} -type f -printf '%T@ %p\n' | sort -n | tail -1 | cut -f2- -d" "); \
701701
if [ $$(basename $$LAST_MODIF) != "timestamp" ]; then \
702-
touch ${ROOT}/../../$DIRNAME/timestamp; \
702+
touch ${ROOT}/../../${DIRNAME}/timestamp; \
703703
touch ${ASSETS_TIMESTAMP}; \
704704
echo ${DIRNAME} changed $$LAST_MODIF; \
705705
fi; \
@@ -855,8 +855,8 @@ manifest :
855855
DBG_FLAG="android:debuggable=\"true\""; \
856856
fi; \
857857
cat ${ROOT}/AndroidManifest.xml.template | \
858-
sed s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g | \
859-
sed s/###BASE_VERSION###/$$BASE_VERSION/g | \
858+
sed "s/###ANDROID_VERSION###/${ANDROID_VERSION_CODE}/g" | \
859+
sed "s/###BASE_VERSION###/$$BASE_VERSION/g" | \
860860
sed -e "s@###DEBUG_BUILD###@$$DBG@g" | \
861861
sed -e "s@###DEBUG_FLAG###@$$DBG_FLAG@g" >${ROOT}/AndroidManifest.xml
862862

0 commit comments

Comments
 (0)
Please sign in to comment.