From 79f0c88a47d9fbfa1a57672f52d4cd730fc6f12c Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Thu, 21 Jul 2016 20:36:41 +1000 Subject: Move luajit.pc to lib directory. --- build.lua | 2 ++ lib/luajit.pc | 25 +++++++++++++++++++++++++ src/others/luajit.pc | 25 ------------------------- 3 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 lib/luajit.pc delete mode 100644 src/others/luajit.pc diff --git a/build.lua b/build.lua index ed5964e..f9501c0 100755 --- a/build.lua +++ b/build.lua @@ -83,6 +83,8 @@ CFLAGOPTS = readCommand('echo "$CFLAGOPTS"') -- Make sure any old servers are killed off. os.execute(baseDir .. '/bin/killem.sh') +PKG_CONFIG_PATH = baseDir .. '/lib:' .. readCommand('echo $PKG_CONFIG_PATH') + CFLAGS = '-g -Wall -I ' .. baseDir .. '/src/libraries' CFLAGS = CFLAGS .. ' ' .. pkgConfig('cflags', 'luajit') --CFLAGS = CFLAGS .. ' ' .. '-I ' .. baseDir .. '/include/luajit-2.0' diff --git a/lib/luajit.pc b/lib/luajit.pc new file mode 100644 index 0000000..2e98b78 --- /dev/null +++ b/lib/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} diff --git a/src/others/luajit.pc b/src/others/luajit.pc deleted file mode 100644 index 2e98b78..0000000 --- a/src/others/luajit.pc +++ /dev/null @@ -1,25 +0,0 @@ -# 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} -- cgit v1.1