fix an install bug for linux

idevz · May 6, 2016 · 6da0ac0 · 6da0ac0
1 parent 81966d0
commit 6da0ac0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/vanilla/Makefile b/vanilla/Makefile
@@ -14,7 +14,7 @@ install: all
 	# $(INSTALL) -d $(VANILLA_LIB_DIR)/vanilla/resty/
 	$(INSTALL) ./bin/ $(VANILLA_LIB_DIR)/bin
 	$(MKDIR) $(VANILLA_LIB_DIR)/vanilla
-	$(INSTALL) ./base/ $(VANILLA_ROOT)/
+	$(INSTALL) ./base/* $(VANILLA_ROOT)/
 	$(INSTALL) ./v $(VANILLA_LIB_DIR)/vanilla
 	$(INSTALL) ./sys $(VANILLA_LIB_DIR)/vanilla
 	$(INSTALL) ./vanilla-$(VANILLA_VERSION) $(VANILLA_BIN_PATH)/vanilla-$(VANILLA_VERSION)

diff --git a/vanilla/base/init.lua b/vanilla/base/init.lua
@@ -87,12 +87,4 @@ init_vanilla = function ()
 end
 
 
---+--------------------------------------------------------------------------------+--
-local helpers = require("/Users/zhoujing/data/vanilla/framework/0_1_0_rc6/vanilla.v.libs.utils")
-function sprint_r( ... )
-    return helpers.sprint_r(...)
-end
-
-function print_r( ... )
-    ngx.say(sprint_r(...))
-end
+--+--------------------------------------------------------------------------------+--
diff --git a/vanilla/sys/application.lua b/vanilla/sys/application.lua
@@ -974,7 +974,7 @@ init_vanilla()
 --+--------------------------------------------------------------------------------+--
 
 
-if Registry['VA_ENV'] == nil then
+-- if Registry['VA_ENV'] == nil then
     local helpers = LoadV "vanilla.v.libs.utils"
     function sprint_r( ... )
         return helpers.sprint_r(...)
@@ -993,7 +993,7 @@ if Registry['VA_ENV'] == nil then
     function err_log(msg)
         ngx.log(ngx.ERR, "===zjdebug" .. msg .. "===")
     end
-end
+-- end
 --+--------------------------------------------------------------------------------+--