From d0c6ea1308b7be0ba9cc4a91ec9248bc9ebaa339 Mon Sep 17 00:00:00 2001 From: Qingping Hou Date: Mon, 10 Oct 2016 01:12:53 -0700 Subject: [PATCH] build(chore): use DIST to label kindle artifacts --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d9e2e1c01..fc5aa1e06 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ kindleupdate: all # ensure that the binaries were built for ARM file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1 # remove old package if any - rm -f koreader-kindle-$(MACHINE)-$(VERSION).zip + rm -f koreader-$(DIST)-$(MACHINE)-$(VERSION).zip # Kindle launching scripts ln -sf ../$(KINDLE_DIR)/extensions $(INSTALL_DIR)/ ln -sf ../$(KINDLE_DIR)/launchpad $(INSTALL_DIR)/ @@ -161,22 +161,22 @@ kindleupdate: all # create new package cd $(INSTALL_DIR) && pwd && \ zip -9 -r \ - ../koreader-kindle-$(MACHINE)-$(VERSION).zip \ + ../koreader-$(DIST)-$(MACHINE)-$(VERSION).zip \ extensions koreader $(KINDLE_LEGACY_LAUNCHER) \ -x "koreader/resources/fonts/*" "koreader/ota/*" \ "koreader/resources/icons/src/*" "koreader/spec/*" # generate kindleupdate package index file - zipinfo -1 koreader-kindle-$(MACHINE)-$(VERSION).zip > \ + zipinfo -1 koreader-$(DIST)-$(MACHINE)-$(VERSION).zip > \ $(INSTALL_DIR)/koreader/ota/package.index echo "koreader/ota/package.index" >> $(INSTALL_DIR)/koreader/ota/package.index # update index file in zip package - cd $(INSTALL_DIR) && zip -u ../koreader-kindle-$(MACHINE)-$(VERSION).zip \ + cd $(INSTALL_DIR) && zip -u ../koreader-$(DIST)-$(MACHINE)-$(VERSION).zip \ koreader/ota/package.index # make gzip kindleupdate for zsync OTA update # note that the targz file extension is intended to keep ISP from caching # the file, see koreader#1644. cd $(INSTALL_DIR) && \ - tar czafh ../koreader-kindle-$(MACHINE)-$(VERSION).targz \ + tar czafh ../koreader-$(DIST)-$(MACHINE)-$(VERSION).targz \ -T koreader/ota/package.index --no-recursion koboupdate: all