Merge branch 'git-sam' into diego-sam-mwild-integration

Conflicts in options.c were just due to independent small functions
being close to each other.

unix.c in mwild was broken, it wasn't using LUASOCKET_API.

serial.c needed luaL_reg renamed, and to use LUASOCKET_API.

makefile didn't respect standard DESTDIR and prefix makefile
variables, and didn't allow LUAV variable to select lua version to build
against.

I've tested the top-level install-both target builds and installs
against both lua5.1 and lua5.2, but not done further testing.

Conflicts:
	README
	config
	gem/ltn012.tex
	makefile
	src/makefile
	src/options.c
	src/options.h
	src/tcp.c
	src/usocket.c

1 files changed, 12 insertions, 3 deletions

diff --git a/makefile b/makefile
index 4275474..8e9e967 100644
--- a/makefile
+++ b/makefile
@@ -6,10 +6,19 @@ PLATS= macosx linux win32
 #
 all: $(PLAT)
 
-$(PLATS) none install local clean:
+$(PLATS) none install install-unix local clean:
         @cd src; $(MAKE) $@
 
-test: dummy
+test:
         lua test/hello.lua
 
-.PHONY: dummy
+install-both:
+        touch src/*.c
+        @cd src; $(MAKE) $(PLAT) LUAV=5.1
+        @cd src; $(MAKE) install-unix LUAV=5.1
+        touch src/*.c
+        @cd src; $(MAKE) $(PLAT) LUAV=5.2
+        @cd src; $(MAKE) install-unix LUAV=5.2
+
+.PHONY: test
+