Merge branch 'master' into v2.1

2013-07-09 17:30:36 +02:00
parent 88188d52f7 519ef0cba7
commit 146807b7e8
6 changed files with 52 additions and 26 deletions
--- a/etc/luajit.pc
+++ b/etc/luajit.pc
@@ -6,13 +6,14 @@ version=${majver}.${minver}.${relver}-alpha
 abiver=5.1

 prefix=/usr/local
+multilib=lib
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/${multilib}
 libname=luajit-${abiver}
 includedir=${prefix}/include/luajit-${majver}.${minver}

 INSTALL_LMOD=${prefix}/share/lua/${abiver}
-INSTALL_CMOD=${prefix}/lib/lua/${abiver}
+INSTALL_CMOD=${prefix}/${multilib}/lua/${abiver}

 Name: LuaJIT
 Description: Just-in-time compiler for Lua