From 561c7902ca2dd2b981721f82be815238dae067aa Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Mon, 1 Jul 2013 02:55:28 -0400
Subject: [PATCH] move defaults.lua to root directory

---
 Makefile                              | 1 +
 frontend/defaults.lua => defaults.lua | 0
 frontend/cache.lua                    | 2 --
 frontend/ui/data/koptoptions.lua      | 1 -
 frontend/ui/reader/readerview.lua     | 1 -
 frontend/ui/uimanager.lua             | 1 -
 reader.lua                            | 1 +
 7 files changed, 2 insertions(+), 5 deletions(-)
 rename frontend/defaults.lua => defaults.lua (100%)

diff --git a/Makefile b/Makefile
index 93eedc669..71bbecf81 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ bootstrapemu:
 	test -e $(EMU_DIR)/history || (mkdir $(EMU_DIR)/history)
 	test -e $(EMU_DIR)/$(MO_DIR) || (cd $(EMU_DIR) && ln -s ../$(MO_DIR) ./)
 	test -e $(EMU_DIR)/ev_replay.py || (cd $(EMU_DIR) && ln -s ../$(KOR_BASE)/ev_replay.py ./)
+	test -e $(EMU_DIR)/defaults.lua || (cd $(EMU_DIR) && ln -s ../defaults.lua ./)
 
 customupdate: all
 	# ensure that the binaries were built for ARM
diff --git a/frontend/defaults.lua b/defaults.lua
similarity index 100%
rename from frontend/defaults.lua
rename to defaults.lua
diff --git a/frontend/cache.lua b/frontend/cache.lua
index 6fedfa371..92f9f42f0 100644
--- a/frontend/cache.lua
+++ b/frontend/cache.lua
@@ -2,8 +2,6 @@
 Inheritable abstraction for cache items
 --]]
 
-require "defaults"
-
 
 CacheItem = {
 	size = 64, -- some reasonable default for simple Lua values / small tables
diff --git a/frontend/ui/data/koptoptions.lua b/frontend/ui/data/koptoptions.lua
index 7e5c6dc40..da4eaa0fb 100644
--- a/frontend/ui/data/koptoptions.lua
+++ b/frontend/ui/data/koptoptions.lua
@@ -1,6 +1,5 @@
 require "ui/screen"
 require "ui/data/strings"
-require "defaults"
 
 KoptOptions = {
 	prefix = 'kopt',
diff --git a/frontend/ui/reader/readerview.lua b/frontend/ui/reader/readerview.lua
index ed176f6c9..7358df8af 100644
--- a/frontend/ui/reader/readerview.lua
+++ b/frontend/ui/reader/readerview.lua
@@ -1,7 +1,6 @@
 require "ui/reader/readerflip"
 require "ui/reader/readerfooter"
 require "ui/reader/readerdogear"
-require "defaults"
 
 ReaderView = OverlapGroup:new{
 	document = nil,
diff --git a/frontend/ui/uimanager.lua b/frontend/ui/uimanager.lua
index ff0ee116e..962b95915 100644
--- a/frontend/ui/uimanager.lua
+++ b/frontend/ui/uimanager.lua
@@ -4,7 +4,6 @@ require "ui/inputevent"
 require "ui/screen"
 require "debug"
 require "gettext"
-require "defaults"
 
 -- initialize output module, this must be initialized before Input
 Screen:init()
diff --git a/reader.lua b/reader.lua
index e4c04ab8a..e90860bab 100755
--- a/reader.lua
+++ b/reader.lua
@@ -1,5 +1,6 @@
 #!./koreader-base
 
+require "defaults"
 package.path = "./frontend/?.lua"
 package.cpath = "/usr/lib/lua/?.so"
 require "ui/uimanager"