From b7e0cb2c80d0816ca27c4967d01523c46d3c9414 Mon Sep 17 00:00:00 2001 From: chrox Date: Tue, 9 Apr 2013 21:01:02 +0800 Subject: [PATCH] Makefile fix i. add make mo in rule of make all ii. make make customupdate depend on make all iii. copy i18n in current directory --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1f67d4b68..4a1e7f8d1 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ XGETTEXT_BIN=$(KOREADER_MISC_TOOL)/gettext/lua_xgettext.py MO_DIR=i18n -all: $(KOR_BASE)/koreader-base $(KOR_BASE)/extr +all: $(KOR_BASE)/koreader-base $(KOR_BASE)/extr mo $(KOR_BASE)/koreader-base $(KOR_BASE)/extr: make -C $(KOR_BASE) koreader-base extr @@ -54,7 +54,7 @@ bootstrapemu: test -e $(EMU_DIR)/history || (mkdir $(EMU_DIR)/history) test -e $(EMU_DIR)/i18n || (cd $(EMU_DIR) && ln -s ../i18n ./) -customupdate: $(KOR_BASE)/koreader-base $(KOR_BASE)/extr +customupdate: all # ensure that the binaries were built for ARM file $(KOR_BASE)/koreader-base | grep ARM || exit 1 file $(KOR_BASE)/extr | grep ARM || exit 1 @@ -70,7 +70,7 @@ customupdate: $(KOR_BASE)/koreader-base $(KOR_BASE)/extr $(STRIP) --strip-unneeded $(INSTALL_DIR)/libs/* cp -rpL $(KOR_BASE)/data/*.css $(INSTALL_DIR)/data cp -rpL $(KOR_BASE)/fonts $(INSTALL_DIR) - cp -rp $(KOR_BASE)/i18n $(INSTALL_DIR) + cp -rp i18n $(INSTALL_DIR) rm $(INSTALL_DIR)/fonts/droid/DroidSansFallbackFull.ttf echo $(VERSION) > git-rev cp -r git-rev resources $(INSTALL_DIR)