From 98cb148be3720f16825f0cb561d975a4890022a9 Mon Sep 17 00:00:00 2001
From: Adam Fitgerald <afitz@gatech.edu>
Date: Sat, 24 Jul 2010 00:38:31 -0400
Subject: [PATCH] build system rollback due to cgo/goinstall incompatibility

---
 Makefile                          | 12 +++++++-----
 example/basic.go                  |  2 +-
 example/panic.go                  |  2 +-
 lua5.1/Makefile                   | 26 --------------------------
 lua5.1/Make.lua => lua51/Makefile |  8 +++++---
 {lua5.1 => lua51}/golua.c         |  0
 {lua5.1 => lua51}/golua.h         |  0
 {lua5.1 => lua51}/lauxlib.go      |  0
 {lua5.1 => lua51}/lua.go          |  0
 9 files changed, 14 insertions(+), 36 deletions(-)
 delete mode 100644 lua5.1/Makefile
 rename lua5.1/Make.lua => lua51/Makefile (93%)
 rename {lua5.1 => lua51}/golua.c (100%)
 rename {lua5.1 => lua51}/golua.h (100%)
 rename {lua5.1 => lua51}/lauxlib.go (100%)
 rename {lua5.1 => lua51}/lua.go (100%)

diff --git a/Makefile b/Makefile
index b51374a..adf77e6 100644
--- 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
index 27168ed..a3cd09f 100644
--- 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
index 0840252..63318de 100644
--- 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
deleted file mode 100644
index 526b850..0000000
--- a/lua5.1/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-
-include $(GOROOT)/src/Make.$(GOARCH)
-
-GOTPATH=$(GOROOT)/pkg/$(GOOS)_$(GOARCH)
-
-OLDNAME=$(GOTPATH)/cgo_github.com_afitz_golua_lua5.1.so
-NEWNAME=$(GOTPATH)/cgo_github.com_afitz_golua_lua51.so
-
-all:
-	make -f Make.lua all
-
-clean:
-	make -f Make.lua clean
-
-install: $(NEWNAME)
-
-$(NEWNAME): $(OLDNAME)
-	cp $(GOTPATH)/cgo_github.com_afitz_golua_lua5.1.so $(GOTPATH)/cgo_github.com_afitz_golua_lua51.so
-
-$(OLDNAME): *.c *.go
-	make -f Make.lua install
-
-uninstall:
-	rm -f $(GOTPATH)/cgo_github.com_afitz_golua_lua51.so
-	make -f Make.lua uninstall
-
diff --git a/lua5.1/Make.lua b/lua51/Makefile
similarity index 93%
rename from lua5.1/Make.lua
rename to lua51/Makefile
index eba536c..5f1e9ec 100644
--- a/lua5.1/Make.lua
+++ b/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 b/lua51/golua.c
similarity index 100%
rename from lua5.1/golua.c
rename to lua51/golua.c
diff --git a/lua5.1/golua.h b/lua51/golua.h
similarity index 100%
rename from lua5.1/golua.h
rename to lua51/golua.h
diff --git a/lua5.1/lauxlib.go b/lua51/lauxlib.go
similarity index 100%
rename from lua5.1/lauxlib.go
rename to lua51/lauxlib.go
diff --git a/lua5.1/lua.go b/lua51/lua.go
similarity index 100%
rename from lua5.1/lua.go
rename to lua51/lua.go