Merge pull request #145 from Tieske/move_win_binaries

moved windows binaries into a 'bin' subdirectory.

1 files changed, 4 insertions, 4 deletions

diff --git a/install.bat b/install.bat
index 15f26070..8222454e 100644
--- a/install.bat
+++ b/install.bat
@@ -44,12 +44,12 @@ local function exec(cmd)
 end

 

 local function exists(filename)

-        local cmd = [[.\bin\test -e "]]..filename..[["]]

+        local cmd = [[.\bin\bin\test -e "]]..filename..[["]]

         return exec(cmd)

 end

 

 local function mkdir (dir)

-        return exec([[.\bin\mkdir -p "]]..dir..[[" >NUL]])

+        return exec([[.\bin\bin\mkdir -p "]]..dir..[[" >NUL]])

 end

 

 -- interpolate string with values from 'vars' table

@@ -272,7 +272,7 @@ local function get_file_runtime(p,f) -- path, filename
         local outfile = "output.txt"

         local content

         -- analyze binary

-        if exec([[.\bin\objdump -x "]]..infile..[[" > ]]..outfile..[[ 2<&1]]) then

+        if exec([[.\bin\bin\objdump -x "]]..infile..[[" > ]]..outfile..[[ 2<&1]]) then

                 -- read temp file

                 local fh = io.open(outfile)

                 content = fh:read("*a")

@@ -480,7 +480,7 @@ if INSTALL_LUA then
 end

 

 -- Copy the LuaRocks binaries

-if not exec(S[[COPY bin\*.* "$BINDIR" >NUL]]) then

+if not exec(S[[XCOPY /S bin\*.* "$BINDIR" >NUL]]) then

         die()

 end

 -- Copy the LuaRocks lua source files