From 93d04839fc6417bb8b9e829f9cd4834289b81661 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Wed, 1 Jan 2014 16:07:28 -0500
Subject: [PATCH] support for building against custom koreader-base repo

---
 Makefile      | 14 ++++++++++----
 README.md     | 12 ++++++++++--
 koreader-base |  2 +-
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 93ec7666d..00f594175 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # koreader-base directory
-KOR_BASE=koreader-base
+KOR_BASE?=koreader-base
 
 # the repository might not have been checked out yet, so make this
 # able to fail:
@@ -28,13 +28,17 @@ all: $(KOR_BASE)/$(OUTPUT_DIR)/luajit po mo
 	$(MAKE) -C $(KOR_BASE)
 	echo $(VERSION) > git-rev
 	mkdir -p $(INSTALL_DIR)/koreader
-	cp -rfL $(KOR_BASE)/$(OUTPUT_DIR)/* $(INSTALL_DIR)/koreader/
 ifdef EMULATE_READER
 	cp -f $(KOR_BASE)/ev_replay.py $(INSTALL_DIR)/koreader/
+	# create symlink instead of copying files in development mode
+	cd $(INSTALL_DIR)/koreader && \
+		ln -sf ../../$(KOR_BASE)/$(OUTPUT_DIR)/* .
+else
+	cp -rfL $(KOR_BASE)/$(OUTPUT_DIR)/* $(INSTALL_DIR)/koreader/
 endif
 	for f in $(INSTALL_FILES); do \
 		ln -sf ../../$$f $(INSTALL_DIR)/koreader/; \
-		done
+	done
 	cp -rpL resources/fonts/* $(INSTALL_DIR)/koreader/fonts/
 	mkdir -p $(INSTALL_DIR)/koreader/screenshots
 	mkdir -p $(INSTALL_DIR)/koreader/data/dict
@@ -49,9 +53,11 @@ endif
 	cd $(INSTALL_DIR)/kobo && tar -czhf ../KoboRoot.tgz mnt
 	cp resources/koreader.png $(INSTALL_DIR)/koreader.png
 	cp fmon/README.txt $(INSTALL_DIR)/README_kobo.txt
-	# clean up
+ifndef EMULATE_READER
+	# clean up, remove unused files for releases
 	rm -rf $(INSTALL_DIR)/koreader/data/{cr3.ini,cr3skin-format.txt,desktop,devices,manual}
 	rm $(INSTALL_DIR)/koreader/fonts/droid/DroidSansFallbackFull.ttf
+endif
 
 $(KOR_BASE)/$(OUTPUT_DIR)/luajit:
 	$(MAKE) -C $(KOR_BASE)
diff --git a/README.md b/README.md
index 1ca04dbfc..bd62785d3 100644
--- a/README.md
+++ b/README.md
@@ -82,13 +82,12 @@ If you already done a real device build, you must do:
 make clean
 ```
 
-To build
+To build:
 ```
 EMULATE_READER=1 make
 ```
 
 To run:
-
 ```
 cd koreader-*/koreader && ./reader.lua -d ./
 ```
@@ -96,6 +95,15 @@ cd koreader-*/koreader && ./reader.lua -d ./
 You can also specify size of emulator's screen via environment variables.
 For more information, please refer to [koreader-base's README][base-readme].
 
+To use your own koreader-base repo instead of the default one change KOR_BASE
+environment variable:
+```
+EMULATE_READER=1 make KOR_BASE=../koreader-base
+```
+
+This will be handy if you are developing koreader-base and want to test your
+modifications with kroeader frontend. NOTE: only support relative path for now.
+
 
 Use ccache
 ==========
diff --git a/koreader-base b/koreader-base
index 8a8204cc9..8b9989a5f 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit 8a8204cc9520a17979c12e2295e9eb4b1b24632d
+Subproject commit 8b9989a5f91d1e708a285c3e660009232ad14a08