fix missing "lua" pathname component in LUA_ELDIR, LUA_LDIR, LUA_CDIR

djerius · Apr 27, 2015 · 14e72aa · 14e72aa
1 parent ad10251
commit 14e72aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/luaconf.h.template.in b/src/luaconf.h.template.in
@@ -100,9 +100,9 @@
 
 #define LUA_VDIR	"%LUA_VDIR%/"
 
-#define LUA_ELDIR	"%exec_datadir%/" LUA_VDIR
-#define LUA_LDIR	"%datadir%/" LUA_VDIR
-#define LUA_CDIR	"%libdir%/" LUA_VDIR
+#define LUA_ELDIR	"%exec_datadir%/lua/" LUA_VDIR
+#define LUA_LDIR	"%datadir%/lua/"      LUA_VDIR
+#define LUA_CDIR	"%libdir%/lua/"       LUA_VDIR
 
 #if !defined(LUA_PATH_DEFAULT)
 

diff --git a/test.configure/tests.bats b/test.configure/tests.bats
@@ -19,6 +19,9 @@ LUA_CPATH_DEFAULT='"./[?].so;"\s+LUA_CDIR"[?].so;"\s+LUA_CDIR"loadall.so"'
     subst_is LUA_PC "lua.pc"
     define_is LUA_VDIR '"'"${LUA_V}/"'"'
 
+    define_like LUA_LDIR '^"/usr/local/share/lua/"'
+    define_like LUA_CDIR '^"/usr/local/lib/lua/"'
+
     define_like LUA_PATH_DEFAULT "$LUA_PATH_DEFAULT"
     define_like LUA_CPATH_DEFAULT "$LUA_CPATH_DEFAULT"