Update Lua building stuff.

2 files changed, 30 insertions, 3 deletions

diff --git a/build.lua b/build.lua
index 3c29f2a..ed5964e 100755
--- a/build.lua
+++ b/build.lua
@@ -81,17 +81,19 @@ locale_d = baseDir .. '/locale'
 CFLAGOPTS = readCommand('echo "$CFLAGOPTS"')
 
 -- Make sure any old servers are killed off.
-os.execute(baseDir .. '/bin//killem.sh')
+os.execute(baseDir .. '/bin/killem.sh')
 
 CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries'
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit')
+--CFLAGS = CFLAGS .. ' ' .. '-I ' .. baseDir .. '/include/luajit-2.0'
 CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'elementary')
 CFLAGS = CFLAGS .. ' ' .. CFLAGOPTS
 
-LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit')
+--LDFLAGS = '-L ' .. baseDir .. '/lib '
+LDFLAGS = '-L ' .. baseDir .. '/lib ' .. pkgConfig('libs-only-L', 'luajit') .. ' '
 libs = '-lLumbrJack -lRunnr -lSledjHamr -lwinFang ' .. pkgConfig('libs', 'elementary') .. ' ' .. pkgConfig('libs', 'luajit') .. ' -lm -Wl,-rpath,' .. baseDir .. '/lib -ldl'
 LFLAGS = '-d'
-EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media'
+EDJE_FLAGS = '-id ' .. baseDir .. '/media/images -fd ' .. baseDir .. '/media/fonts'
 
 
 if 'nil' == type(args) then
diff --git a/src/others/luajit.pc b/src/others/luajit.pc
new file mode 100644
index 0000000..2e98b78
--- /dev/null
+++ b/src/others/luajit.pc
@@ -0,0 +1,25 @@
+# Package information for LuaJIT to be used by pkg-config.
+majver=2
+minver=0
+relver=4
+version=${majver}.${minver}.${relver}
+abiver=5.1
+
+prefix=/usr/local/
+multilib=lib
+exec_prefix=${prefix}
+libdir=${exec_prefix}/${multilib}
+libname=luajit-${abiver}
+includedir=${prefix}/include/luajit-${majver}.${minver}
+
+INSTALL_LMOD=${prefix}/share/lua/${abiver}
+INSTALL_CMOD=${prefix}/${multilib}/lua/${abiver}
+
+Name: LuaJIT
+Description: Just-in-time compiler for Lua
+URL: http://luajit.org
+Version: ${version}
+Requires:
+Libs: -L${libdir} -l${libname}
+Libs.private: -Wl,-E -lm -ldl
+Cflags: -I${includedir}