2 files changed, 22 insertions, 12 deletions
diff --git a/makefile b/makefile
index 934485b..f9fa6fe 100644
--- a/makefile
+++ b/makefile
@@ -23,10 +23,10 @@ test:
        lua test/hello.lua
 install-both:
-        touch src/*.c
+        $(MAKE) clean 
        @cd src; $(MAKE) $(PLAT) LUAV=5.1
        @cd src; $(MAKE) install-unix LUAV=5.1
-        touch src/*.c
+        $(MAKE) clean 
        @cd src; $(MAKE) $(PLAT) LUAV=5.2
        @cd src; $(MAKE) install-unix LUAV=5.2
diff --git a/src/makefile b/src/makefile
index 4df62bd..70425c4 100644
--- a/src/makefile
+++ b/src/makefile
@@ -25,26 +25,36 @@ LUAV?=5.1
 # for testing and debugging luasocket itself
 DEBUG?=NODEBUG
-# prefix: /usr/local /usr /opt/local /sw
-# the top of the default install tree
-prefix?=/usr/local
 # where lua headers are found for macosx builds
-# LUAINC_macosx: /opt/local/include
+# LUAINC_macosx: 
-LUAINC_macosx?=/opt/local/include
+# /opt/local/include
-# FIXME default should be where fink puts lua
+LUAINC_macosx_base?=/opt/local/include
+LUAINC_macosx?=$(LUAINC_macosx_base)$(LUAV)
-# LUAINC_linux: /usr/include/lua$(LUAV) /usr/local/include /usr/local/include/lua$(LUAV)
+# FIXME default should this default to fink or to macports?
+# What happens when more than one Lua version is installed?
+LUAPREFIX_macosx?=/opt/local/
+# LUAINC_linux: 
+# /usr/include/lua$(LUAV) 
+# /usr/local/include 
+# /usr/local/include/lua$(LUAV)
 # where lua headers are found for linux builds
-LUAINC_linux?=/usr/include/lua$(LUAV)
+LUAINC_linux_base?=/usr/include
+LUAINC_linux?=$(LUAINC_linux_base)$(LUAV)
+LUAPREFIX_linux?=/usr/local
 # LUAINC_win32:
 # LUALIB_win32:
 # where lua headers and libraries are found for win32 builds
 LUAINC_win32?="../../lua-5.1.3/src"
 LUALIB_win32?="../../lua-5.1.3"
+LUAPREFIX_win32?=
 # FIXME default should be where lua-for-windows puts lua
+# prefix: /usr/local /usr /opt/local /sw
+# the top of the default install tree
+prefix?=$(LUAPREFIX_$(PLAT))
 # DESTDIR: (no default)
 # used by package managers to install into a temporary destination
 DESTDIR=

diff --git a/makefile b/makefile index 934485b..f9fa6fe 100644 --- a/makefile +++ b/makefile
@@ -23,10 +23,10 @@ test:
23	lua test/hello.lua	23	lua test/hello.lua
24		24
25	install-both:	25	install-both:
26	touch src/*.c	26	$(MAKE) clean
27	@cd src; $(MAKE) $(PLAT) LUAV=5.1	27	@cd src; $(MAKE) $(PLAT) LUAV=5.1
28	@cd src; $(MAKE) install-unix LUAV=5.1	28	@cd src; $(MAKE) install-unix LUAV=5.1
29	touch src/*.c	29	$(MAKE) clean
30	@cd src; $(MAKE) $(PLAT) LUAV=5.2	30	@cd src; $(MAKE) $(PLAT) LUAV=5.2
31	@cd src; $(MAKE) install-unix LUAV=5.2	31	@cd src; $(MAKE) install-unix LUAV=5.2
32		32


diff --git a/src/makefile b/src/makefile index 4df62bd..70425c4 100644 --- a/src/makefile +++ b/src/makefile
@@ -25,26 +25,36 @@ LUAV?=5.1
25	# for testing and debugging luasocket itself	25	# for testing and debugging luasocket itself
26	DEBUG?=NODEBUG	26	DEBUG?=NODEBUG
27		27
28	# prefix: /usr/local /usr /opt/local /sw
29	# the top of the default install tree
30	prefix?=/usr/local
31
32	# where lua headers are found for macosx builds	28	# where lua headers are found for macosx builds
33	# LUAINC_macosx: /opt/local/include	29	# LUAINC_macosx:
34	LUAINC_macosx?=/opt/local/include	30	# /opt/local/include
35	# FIXME default should be where fink puts lua	31	LUAINC_macosx_base?=/opt/local/include
36		32	LUAINC_macosx?=$(LUAINC_macosx_base)$(LUAV)
37	# LUAINC_linux: /usr/include/lua$(LUAV) /usr/local/include /usr/local/include/lua$(LUAV)	33	# FIXME default should this default to fink or to macports?
		34	# What happens when more than one Lua version is installed?
		35	LUAPREFIX_macosx?=/opt/local/
		36
		37	# LUAINC_linux:
		38	# /usr/include/lua$(LUAV)
		39	# /usr/local/include
		40	# /usr/local/include/lua$(LUAV)
38	# where lua headers are found for linux builds	41	# where lua headers are found for linux builds
39	LUAINC_linux?=/usr/include/lua$(LUAV)	42	LUAINC_linux_base?=/usr/include
		43	LUAINC_linux?=$(LUAINC_linux_base)$(LUAV)
		44	LUAPREFIX_linux?=/usr/local
40		45
41	# LUAINC_win32:	46	# LUAINC_win32:
42	# LUALIB_win32:	47	# LUALIB_win32:
43	# where lua headers and libraries are found for win32 builds	48	# where lua headers and libraries are found for win32 builds
44	LUAINC_win32?="../../lua-5.1.3/src"	49	LUAINC_win32?="../../lua-5.1.3/src"
45	LUALIB_win32?="../../lua-5.1.3"	50	LUALIB_win32?="../../lua-5.1.3"
		51	LUAPREFIX_win32?=
46	# FIXME default should be where lua-for-windows puts lua	52	# FIXME default should be where lua-for-windows puts lua
47		53
		54	# prefix: /usr/local /usr /opt/local /sw
		55	# the top of the default install tree
		56	prefix?=$(LUAPREFIX_$(PLAT))
		57
48	# DESTDIR: (no default)	58	# DESTDIR: (no default)
49	# used by package managers to install into a temporary destination	59	# used by package managers to install into a temporary destination
50	DESTDIR=	60	DESTDIR=