lua: respect configure's --prefix

Install lua files under the confiugred --prefix rather than use the pkg-config's variables LUA_INSTALL_[CL]MOD. Users will likely want user --prefix while packagers will use DESTDIR. Set the default to $datadir/lua/$LUA_VERSION for arch independent lua modules and $libdir/lua/$LUA_VERSION for arch dependant .so module. This should work for most distros. If it does not, then packagers can still do: make install lualibdir=$(pkg-config lua --variable=INSTALL_CMOD) ... This fixes #169 Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> Acked-by: Dwight Engen <dwight.engen@oracle.com> Acked-by: Stéphane Graber <stgraber@ubuntu.com>

lua: respect configure's --prefix
b71f50dc · Natanael Copa · Stéphane Graber · b57b58d4 · b71f50dc · b71f50dc
Commit b71f50dc authored Mar 04, 2014 by Natanael Copa Committed by Stéphane Graber Mar 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

configure.ac configure.ac +2 -4

Makefile.am src/lua-lxc/Makefile.am +4 -2

No files found.
--- a/configure.ac
+++ b/configure.ac
@@ -379,10 +379,8 @@ AM_COND_IF([ENABLE_LUA],
 	PKG_CHECK_VAR([LUA_VERSION], [$LUAPKGCONFIG], [V],,
 		[PKG_CHECK_VAR([LUA_VERSION], [$LUAPKGCONFIG], [major_version])])
 	AC_MSG_RESULT([$LUA_VERSION])
-	PKG_CHECK_VAR([LUA_INSTALL_CMOD], [$LUAPKGCONFIG], [INSTALL_CMOD],,
+	AC_SUBST([LUA_LIBDIR], [$libdir/lua/$LUA_VERSION])
-		[LUA_INSTALL_CMOD=$libdir/lua/$LUA_VERSION])
+	AC_SUBST([LUA_SHAREDIR], [$datadir/lua/$LUA_VERSION])
-	PKG_CHECK_VAR([LUA_INSTALL_LMOD], [$LUAPKGCONFIG], [INSTALL_LMOD],,
-		[LUA_INSTALL_LMOD=$datadir/lua/$LUA_VERSION])
 	])
 # Optional bash integration

--- a/src/lua-lxc/Makefile.am
+++ b/src/lua-lxc/Makefile.am
 if ENABLE_LUA
-luadir=$(LUA_INSTALL_LMOD)
+luasharedir=$(LUA_SHAREDIR)
-sodir=$(LUA_INSTALL_CMOD)/lxc
+lualibdir=$(LUA_LIBDIR)
+luadir=$(luasharedir)
+sodir=$(lualibdir)/lxc
 lua_DATA=lxc.lua