build system rollback due to cgo/goinstall incompatibility

afitz · Jul 24, 2010 · 98cb148 · 98cb148
1 parent f1d57d9
commit 98cb148
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 36 deletions.
diff --git a/Makefile b/Makefile
@@ -1,16 +1,18 @@
 
-all: lua5.1/_obj/lua5.1.a examples
+LUA51_DIR=lua51
 
-lua5.1/_obj/lua5.1.a:
-	cd lua5.1 && make
+all: $(LUA51_DIR)/_obj/lua51.a examples
+
+$(LUA51_DIR)/_obj/lua51.a:
+	cd $(LUA51_DIR) && make 
 
 examples: install
 	cd example && make
 
 clean:
 	cd example && make clean
-	cd lua5.1 && make clean
+	cd $(LUA51_DIR) && make clean
 
 install:
-	cd lua5.1 && make install 
+	cd $(LUA51_DIR) && make install
 
diff --git a/example/basic.go b/example/basic.go
@@ -1,6 +1,6 @@
 package main
 
-import lua51 "github.com/afitz/golua/lua5.1"
+import "lua51"
 import "fmt"
 
 func test(L *lua51.State) int {

diff --git a/example/panic.go b/example/panic.go
@@ -1,6 +1,6 @@
 package main
 
-import lua "github.com/afitz/golua/lua5.1"
+import lua "lua51"
 import "fmt"
 
 func test(L *lua.State) int {

diff --git a/lua5.1/Makefile b/lua5.1/Makefile
diff --git a/lua5.1/Make.lua → lua51/Makefile b/lua5.1/Make.lua → lua51/Makefile
@@ -4,9 +4,11 @@
 
 include $(GOROOT)/src/Make.$(GOARCH)
 
-ifndef TARG
-TARG=github.com/afitz/golua/lua5.1
-endif
+#ifndef TARG
+#TARG=github.com/afitz/golua/lua5.1
+#endif
+
+TARG=lua51
 
 CGO_CFLAGS=-I/usr/include/lua5.1
 CGO_LDFLAGS=_cgo_export.o -L/usr/lib/lua5.1 -L./ -llua5.1 -lgolua

diff --git a/lua5.1/golua.c → lua51/golua.c b/lua5.1/golua.c → lua51/golua.c
diff --git a/lua5.1/golua.h → lua51/golua.h b/lua5.1/golua.h → lua51/golua.h
diff --git a/lua5.1/lauxlib.go → lua51/lauxlib.go b/lua5.1/lauxlib.go → lua51/lauxlib.go
diff --git a/lua5.1/lua.go → lua51/lua.go b/lua5.1/lua.go → lua51/lua.go