fixing linux/cygwin build, work in progress

diff --git a/src/Makefile b/src/Makefile
index 98f3ca42340f2098fb3ce16dd0a7bed9964a5650..e5b71be5d787af598f8fb3b4fe879c19a1a136d4 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,10 +28,7 @@ setenv.sh: config
 
 copy-libraries: lib/
        mkdir -p $(TARGET_LUA_PATH)
-       cp -Rp lib/ $(TARGET_LUA_PATH)/
-
-
-#      cp -p -R lib/* $(TARGET_LUA_PATH)/
+       cp -Rp lib/* $(TARGET_LUA_PATH)/
 
 compile-libraries: copy-libraries bin-libraries setenv.sh compiler
        echo "Compiling libraries:"

diff --git a/src/compiler/Makefile b/src/compiler/Makefile
index d6913491d897d72734c590e81808baa24e1eb12e..561e7c3ace986b09a965418a579567037358b3ec 100644 (file)
--- a/src/compiler/Makefile
+++ b/src/compiler/Makefile
@@ -31,6 +31,8 @@ MLP_LUA =           \
       mlp_stat.lua  \
       mlp_ext.lua 
 
+metalua.luac: mlc.luac
+
 bytecode.luac: $(BYTECODE_LUA)
        $(LUA_COMPILE) -o $@ $^
 

diff --git a/src/lib/package2.lua b/src/lib/package2.lua
index 8007063802e9f3932eeb4679a467ff31e6176eea..5ac1fe2356c8359a12d5feaec1615d8b8d6fd170 100644 (file)
--- a/src/lib/package2.lua
+++ b/src/lib/package2.lua
@@ -46,7 +46,7 @@ end
 -- Execute a metalua module sources compilation in a separate ring.
 ----------------------------------------------------------------------
 local function spring_load(filename)   
-   local env_fast = os.getenv 'LUA_FAST'
+   local env_fast = os.getenv 'LUA_MFAST'
 
    if env_fast=='yes' or env_fast=='true' then 
       -- degraded mode without spring: