|
@@ -730,7 +730,14 @@ let generate_libs_init = function
|
|
|
var @b = if( @s == "Windows" )
|
|
|
@env("HAXEPATH") + "\\lib\\"
|
|
|
else try $loader.loadprim("std@file_contents",1)(@env("HOME")+"/.haxelib") + "/"
|
|
|
- catch e if( @s == "Linux" ) "/usr/lib/haxe/lib/" else "/usr/local/lib/haxe/lib/";
|
|
|
+ catch e
|
|
|
+ if( @s == "Linux" )
|
|
|
+ if( $loader(loadprim("std@sys_exists",1))("/usr/lib/haxe/lib") )
|
|
|
+ "/usr/lib/haxe/lib"
|
|
|
+ else
|
|
|
+ "/usr/share/haxe/lib/"
|
|
|
+ else
|
|
|
+ "/usr/local/lib/haxe/lib/";
|
|
|
if( $loader.loadprim("std@sys_is64",0)() ) @s = @s + 64;
|
|
|
@s = @s + "/"
|
|
|
*)
|
|
@@ -752,7 +759,9 @@ let generate_libs_init = function
|
|
|
op "+" (call p (loadp "file_contents" 1) [op "+" (call p (ident p "@env") [str p "HOME"]) (str p "/.haxelib")]) (str p "/"),
|
|
|
"e",
|
|
|
(EIf (op "==" es (str p "Linux"),
|
|
|
- str p "/usr/lib/haxe/lib/",
|
|
|
+ (EIf (call p (loadp "sys_exists" 1) [ str p "/usr/lib/haxe/lib" ],
|
|
|
+ str p "/usr/lib/haxe/lib/",
|
|
|
+ Some (str p "/usr/share/haxe/lib/")),p),
|
|
|
Some (str p "/usr/local/lib/haxe/lib/")
|
|
|
),p)
|
|
|
),p)
|