Merge branch 'pkulchenko' into unstable

1 files changed, 14 insertions, 5 deletions

diff --git a/makefile b/makefile
index f9fa6fe..04cd894 100644
--- a/makefile
+++ b/makefile
@@ -3,13 +3,14 @@
 # see src/makefile for description of how to customize the build
 #
 # Targets:
-#   install       install system independent support
-#   install-unix  also install unix-only support
-#   install-both  install both lua5.1 and lua5.2 socket support
-#   print         print the build settings
+#   install            install system independent support
+#   install-unix           also install unix-only support
+#   install-both       install for both lua5.1 and lua5.2 
+#   install-both-unix      also install unix-only 
+#   print                  print the build settings
 
 PLAT?= linux
-PLATS= macosx linux win32
+PLATS= macosx linux win32 mingw
 
 all: $(PLAT)
 
@@ -25,6 +26,14 @@ test:
 install-both:
         $(MAKE) clean 
         @cd src; $(MAKE) $(PLAT) LUAV=5.1
+        @cd src; $(MAKE) install LUAV=5.1
+        $(MAKE) clean 
+        @cd src; $(MAKE) $(PLAT) LUAV=5.2
+        @cd src; $(MAKE) install LUAV=5.2
+
+install-both-unix:
+        $(MAKE) clean 
+        @cd src; $(MAKE) $(PLAT) LUAV=5.1
         @cd src; $(MAKE) install-unix LUAV=5.1
         $(MAKE) clean 
         @cd src; $(MAKE) $(PLAT) LUAV=5.2