Skip to content

Commit

Permalink
Android: Fix minor makefile bugs
Browse files Browse the repository at this point in the history
Fix commenting happening thanks to missing quotes and dereference variable the right way,
to get rid of a compile error.
  • Loading branch information
est31 committed Jul 29, 2015
1 parent ca63f7f commit f97c270
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build/android/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit f97c270

Please sign in to comment.