diff options
| -rw-r--r-- | install | 10 | ||||
| -rw-r--r-- | install_dev | 15 | ||||
| -rw-r--r-- | src/lua5/loh51/le32/im_fftw.loh | 4 | ||||
| -rw-r--r-- | src/lua5/loh51/le32/im_process.loh | 4 | ||||
| -rw-r--r-- | src/lua5/loh51/le64/im_fftw.loh | 4 | ||||
| -rw-r--r-- | src/lua5/loh51/le64/im_process.loh | 4 |
6 files changed, 23 insertions, 18 deletions
@@ -9,6 +9,8 @@ echo ' Must be run with "sudo" at the library folder, or install will fail:' echo ' sudo ./install' echo ' ' +SYSTEM_LIB=/usr/lib + EchoDownloadTip() { echo ' The downloaded package must already be unpacked in the current directory.' @@ -61,15 +63,15 @@ ComputeTecUname() Copy_RunTime_Extra_CD() { # Do NOT overwrite for FreeType - cp -fn $1libfreetype.so /usr/lib + cp -fn $1libfreetype.so $SYSTEM_LIB - cp -fv $1libpdflib.so /usr/lib - cp -fv $1libftgl.so /usr/lib + cp -fv $1libpdflib.so $SYSTEM_LIB + cp -fv $1libftgl.so $SYSTEM_LIB } Copy_RunTime_To_System() { - cp -fv $2lib$1*.so /usr/lib + cp -fv $2lib$1*.so $SYSTEM_LIB if [ $1 == cd ]; then Copy_RunTime_Extra_CD $2 diff --git a/install_dev b/install_dev index ec51a10..859229c 100644 --- a/install_dev +++ b/install_dev @@ -9,6 +9,9 @@ echo ' Must be run with "sudo" at the library folder, or install will fail:' echo ' sudo ./install_dev' echo ' ' +SYSTEM_LIB=/usr/lib +SYSTEM_INC=/usr/include + EchoDownloadTip() { echo ' The downloaded package must already be unpacked in the current directory.' @@ -61,17 +64,17 @@ ComputeTecUname() Copy_Dev_Extra_CD() { # Do NOT overwrite for FreeType - cp -fn $1libfreetype.a /usr/lib + cp -fn $1libfreetype.a $SYSTEM_LIB - cp -fv $1libpdflib.a /usr/lib - cp -fv $1libftgl.a /usr/lib + cp -fv $1libpdflib.a $SYSTEM_LIB + cp -fv $1libftgl.a $SYSTEM_LIB } Copy_Dev_To_System() { - mkdir -p /usr/include/$1 - cp -fv include/*.h /usr/include/$1 - cp -fv $2lib$1*.a /usr/lib + mkdir -p $SYSTEM_INC/$1 + cp -fv include/*.h $SYSTEM_INC/$1 + cp -fv $2lib$1*.a $SYSTEM_LIB if [ $1 == cd ]; then Copy_Dev_Extra_CD $2 diff --git a/src/lua5/loh51/le32/im_fftw.loh b/src/lua5/loh51/le32/im_fftw.loh index 08b4650..4deaf03 100644 --- a/src/lua5/loh51/le32/im_fftw.loh +++ b/src/lua5/loh51/le32/im_fftw.loh @@ -1,7 +1,7 @@ /* code automatically generated by bin2c -- DO NOT EDIT */ { /* #include'ing this file in a C program is equivalent to calling - if (luaL_loadfile(L,"../obj/imlua_fftw51/im_fftw.lo")==0) lua_call(L, 0, 0); + if (luaL_loadfile(L,"../obj/imlua_fftw51/im_fftw.lo")==0) lua_pcall(L, 0, 0, 0); */ /* ../obj/imlua_fftw51/im_fftw.lo */ static const unsigned char B1[]={ @@ -103,5 +103,5 @@ static const unsigned char B1[]={ 17, 0, 0, 0, 0, 0, 0, 0, }; - if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"../obj/imlua_fftw51/im_fftw.lo")==0) lua_call(L, 0, 0); + if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"../obj/imlua_fftw51/im_fftw.lo")==0) lua_pcall(L, 0, 0, 0); } diff --git a/src/lua5/loh51/le32/im_process.loh b/src/lua5/loh51/le32/im_process.loh index db3ff1a..6b6284b 100644 --- a/src/lua5/loh51/le32/im_process.loh +++ b/src/lua5/loh51/le32/im_process.loh @@ -1,7 +1,7 @@ /* code automatically generated by bin2c -- DO NOT EDIT */ { /* #include'ing this file in a C program is equivalent to calling - if (luaL_loadfile(L,"../obj/imlua_process51/im_process.lo")==0) lua_call(L, 0, 0); + if (luaL_loadfile(L,"../obj/imlua_process51/im_process.lo")==0) lua_pcall(L, 0, 0, 0); */ /* ../obj/imlua_process51/im_process.lo */ static const unsigned char B1[]={ @@ -809,5 +809,5 @@ static const unsigned char B1[]={ 0, 0, 0, }; - if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"../obj/imlua_process51/im_process.lo")==0) lua_call(L, 0, 0); + if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"../obj/imlua_process51/im_process.lo")==0) lua_pcall(L, 0, 0, 0); } diff --git a/src/lua5/loh51/le64/im_fftw.loh b/src/lua5/loh51/le64/im_fftw.loh index 9e281c0..289760d 100644 --- a/src/lua5/loh51/le64/im_fftw.loh +++ b/src/lua5/loh51/le64/im_fftw.loh @@ -1,7 +1,7 @@ /* code automatically generated by bin2c -- DO NOT EDIT */ { /* #include'ing this file in a C program is equivalent to calling - if (luaL_loadfile(L,"../obj/imlua_fftw51/im_fftw.lo")==0) lua_call(L, 0, 0); + if (luaL_loadfile(L,"../obj/imlua_fftw51/im_fftw.lo")==0) lua_pcall(L, 0, 0, 0); */ /* ../obj/imlua_fftw51/im_fftw.lo */ static const unsigned char B1[]={ @@ -114,5 +114,5 @@ static const unsigned char B1[]={ 101,115,116, 0, 2, 0, 0, 0, 17, 0, 0, 0, 0, 0, 0, 0, }; - if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"../obj/imlua_fftw51/im_fftw.lo")==0) lua_call(L, 0, 0); + if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"../obj/imlua_fftw51/im_fftw.lo")==0) lua_pcall(L, 0, 0, 0); } diff --git a/src/lua5/loh51/le64/im_process.loh b/src/lua5/loh51/le64/im_process.loh index 5508459..1c7dffa 100644 --- a/src/lua5/loh51/le64/im_process.loh +++ b/src/lua5/loh51/le64/im_process.loh @@ -1,7 +1,7 @@ /* code automatically generated by bin2c -- DO NOT EDIT */ { /* #include'ing this file in a C program is equivalent to calling - if (luaL_loadfile(L,"../obj/imlua_process51/im_process.lo")==0) lua_call(L, 0, 0); + if (luaL_loadfile(L,"../obj/imlua_process51/im_process.lo")==0) lua_pcall(L, 0, 0, 0); */ /* ../obj/imlua_process51/im_process.lo */ static const unsigned char B1[]={ @@ -888,5 +888,5 @@ static const unsigned char B1[]={ 0, 0, 0, }; - if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"../obj/imlua_process51/im_process.lo")==0) lua_call(L, 0, 0); + if (luaL_loadbuffer(L,(const char*)B1,sizeof(B1),"../obj/imlua_process51/im_process.lo")==0) lua_pcall(L, 0, 0, 0); } |