Merge branch 'master' of github.com:keplerproject/luarocks

2 files changed, 34 insertions, 1 deletions

diff --git a/install.bat b/install.bat
index 8222454e..abf680a4 100644
--- a/install.bat
+++ b/install.bat
@@ -643,7 +643,7 @@ print(S[[
  You may want to add the following elements to your paths;

 PATH     :   $LUA_BINDIR;$FULL_PREFIX

 LUA_PATH :   $ROCKS_TREE\share\lua\$LUA_VERSION\?.lua;$ROCKS_TREE\share\lua\$LUA_VERSION\?\init.lua

-LUA_CPATH:   $LUA_LIBDIR\lua\$LUA_VERSION\?.dll

+LUA_CPATH:   $ROCKS_TREE\lib\lua\$LUA_VERSION\?.dll

 

 ]])

 os.exit(0)

diff --git a/win32pack.bat b/win32pack.bat
new file mode 100644
index 00000000..022a44db
--- /dev/null
+++ b/win32pack.bat
@@ -0,0 +1,33 @@
+@ECHO OFF
+ECHO.
+IF "%1"=="" GOTO GOEXIT
+
+:PACKIT
+mkdir %1
+mkdir %1\test
+mkdir %1\src
+xcopy /S/E .\test\*.* %1\test
+xcopy /S/E .\src\*.* %1\src
+xcopy /S/E .\win32\*.* %1
+copy *.* %1
+del %1\configure
+del %1\makedist
+del %1\Makefile
+del %1\win32pack.bat
+cd %1
+
+GOTO:EOF
+
+:GOEXIT
+ECHO.
+ECHO This command creates a directory with an installable LuaRocks structure. This is
+ECHO a workaround for the packaging script being a unix shell script.
+ECHO.
+ECHO To install LuaRocks on Windows from a Git repo use the following commands: 
+ECHO.
+ECHO    %0 ^<TARGET_DIR^>
+ECHO    install /?
+ECHO.
+ECHO Then follow instructions displayed to install LuaRocks
+ECHO.
+