fix

apache · Mar 28, 2020 · 5f46cb5 · 5f46cb5
1 parent eb13fba
commit 5f46cb5
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 28 deletions.
diff --git a/Makefile b/Makefile
@@ -120,44 +120,41 @@ install:
 	$(INSTALL) -d $(INST_LUADIR)/apisix
 	$(INSTALL) *.lua $(INST_LUADIR)/apisix/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix
-	$(INSTALL) apisix/*.lua $(INST_LUADIR)/apisix/apisix/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/admin
+	$(INSTALL) apisix/admin/*.lua $(INST_LUADIR)/apisix/admin/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/admin
-	$(INSTALL) apisix/admin/*.lua $(INST_LUADIR)/apisix/apisix/admin/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/core
+	$(INSTALL) apisix/core/*.lua $(INST_LUADIR)/apisix/core/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/core
-	$(INSTALL) apisix/core/*.lua $(INST_LUADIR)/apisix/apisix/core/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/http
+	$(INSTALL) apisix/http/*.lua $(INST_LUADIR)/apisix/http/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/http
-	$(INSTALL) apisix/http/*.lua $(INST_LUADIR)/apisix/apisix/http/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/http/router
+	$(INSTALL) apisix/http/router/*.lua $(INST_LUADIR)/apisix/http/router/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/http/router
-	$(INSTALL) apisix/http/router/*.lua $(INST_LUADIR)/apisix/apisix/http/router/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/plugins
+	$(INSTALL) apisix/plugins/*.lua $(INST_LUADIR)/apisix/plugins/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/plugins
-	$(INSTALL) apisix/plugins/*.lua $(INST_LUADIR)/apisix/apisix/plugins/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/plugins/grpc-transcode
+	$(INSTALL) apisix/plugins/grpc-transcode/*.lua $(INST_LUADIR)/apisix/plugins/grpc-transcode/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/plugins/grpc-transcode
-	$(INSTALL) apisix/plugins/grpc-transcode/*.lua $(INST_LUADIR)/apisix/apisix/plugins/grpc-transcode/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/plugins/limit-count
+	$(INSTALL) apisix/plugins/limit-count/*.lua $(INST_LUADIR)/apisix/plugins/limit-count/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/plugins/limit-count
-	$(INSTALL) apisix/plugins/limit-count/*.lua $(INST_LUADIR)/apisix/apisix/plugins/limit-count/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/plugins/prometheus
+	$(INSTALL) apisix/plugins/prometheus/*.lua $(INST_LUADIR)/apisix/plugins/prometheus/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/plugins/prometheus
-	$(INSTALL) apisix/plugins/prometheus/*.lua $(INST_LUADIR)/apisix/apisix/plugins/prometheus/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/plugins/zipkin
+	$(INSTALL) apisix/plugins/zipkin/*.lua $(INST_LUADIR)/apisix/plugins/zipkin/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/plugins/zipkin
-	$(INSTALL) apisix/plugins/zipkin/*.lua $(INST_LUADIR)/apisix/apisix/plugins/zipkin/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/stream/plugins
+	$(INSTALL) apisix/stream/plugins/*.lua $(INST_LUADIR)/apisix/stream/plugins/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/stream/plugins
-	$(INSTALL) apisix/stream/plugins/*.lua $(INST_LUADIR)/apisix/apisix/stream/plugins/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/stream/router
+	$(INSTALL) apisix/stream/router/*.lua $(INST_LUADIR)/apisix/stream/router/
 
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/stream/router
-	$(INSTALL) apisix/stream/router/*.lua $(INST_LUADIR)/apisix/apisix/stream/router/
-
-	$(INSTALL) -d $(INST_LUADIR)/apisix/apisix/utils
-	$(INSTALL) apisix/utils/*.lua $(INST_LUADIR)/apisix/apisix/utils/
+	$(INSTALL) -d $(INST_LUADIR)/apisix/utils
+	$(INSTALL) apisix/utils/*.lua $(INST_LUADIR)/apisix/utils/
 
 	$(INSTALL) README.md $(INST_CONFDIR)/README.md
 	$(INSTALL) bin/apisix $(INST_BINDIR)/apisix

diff --git a/bin/apisix b/bin/apisix
@@ -58,7 +58,7 @@ if script_path:sub(1, 2) == './' then
 
     pkg_cpath = apisix_home .. "/deps/lib64/lua/5.1/?.so;"
                 .. apisix_home .. "/deps/lib/lua/5.1/?.so;"
-    pkg_path  = apisix_home .. "/lua/?.lua;"
+    pkg_path  = apisix_home .. "/?.lua;"
                 .. apisix_home .. "/deps/share/lua/5.1/?.lua;;"
 end
 -- print("apisix_home: ", apisix_home)