Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 lua-forge/lua/HISTORY   |    3 +++
 lua-forge/lua/INSTALL   |    2 +-
 lua-forge/lua/PRE_BUILD |   12 +++++++++++-
 lua-forge/lua/lua.pc    |   31 -------------------------------
 lua-forge/lua/lua.pc.in |   13 +++++++++++++
 5 files changed, 28 insertions(+), 33 deletions(-)

New commits:
commit 82df8c2e82136cdd782adb5f8f2108f25c71614a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    lua-forge/lua: automatically adapt lua.pc

diff --git a/lua-forge/lua/HISTORY b/lua-forge/lua/HISTORY
index 8893f2e..f60489a 100644
--- a/lua-forge/lua/HISTORY
+++ b/lua-forge/lua/HISTORY
@@ -1,3 +1,6 @@
+2016-09-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, INSTALL, lua.pc lua.pc.in: automatically adapt lua.pc
+
 2016-09-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 5.3.3
 
diff --git a/lua-forge/lua/INSTALL b/lua-forge/lua/INSTALL
index 600f9b5..04f8d1e 100755
--- a/lua-forge/lua/INSTALL
+++ b/lua-forge/lua/INSTALL
@@ -10,4 +10,4 @@ ln -vsf "$TRACK_ROOT/usr/lib/${SO}" 
"$INSTALL_ROOT/usr/lib/liblua.so.5" &&
 
 # install pkgconfig description file
 install -vm 755 -d "$INSTALL_ROOT/usr/lib/pkgconfig" &&
-install -vm 644 "$SPELL_DIRECTORY/lua.pc" "$INSTALL_ROOT/usr/lib/pkgconfig"
+install -vm 644 "$SOURCE_DIRECTORY/lua.pc" "$INSTALL_ROOT/usr/lib/pkgconfig"
diff --git a/lua-forge/lua/PRE_BUILD b/lua-forge/lua/PRE_BUILD
index 697b24f..9a1f2e5 100755
--- a/lua-forge/lua/PRE_BUILD
+++ b/lua-forge/lua/PRE_BUILD
@@ -5,4 +5,14 @@ cd "$SOURCE_DIRECTORY" &&
 sedit "s:/usr/local:$INSTALL_ROOT/usr:" src/luaconf.h &&
 
 # build shared library
-patch -p0 < "$SPELL_DIRECTORY/shared.patch"
+patch -p0 < "$SPELL_DIRECTORY/shared.patch" &&
+
+echo '# lua.pc -- pkg-config data for Lua' > "${SOURCE_DIRECTORY}/lua.pc" &&
+grep '^V=' "${SOURCE_DIRECTORY}/Makefile" >> "${SOURCE_DIRECTORY}/lua.pc" &&
+grep '^R=' "${SOURCE_DIRECTORY}/Makefile" >> "${SOURCE_DIRECTORY}/lua.pc" &&
+grep '^INSTALL_.*=' "${SOURCE_DIRECTORY}/Makefile" \
+  | grep -v 'INSTALL_DATA' \
+  | grep -v 'INSTALL_EXEC' \
+  | sed -e 's/INSTALL_TOP/prefix/' -e 's:/usr/local:/usr:' \
+  | tr '(' '{' | tr ')' '}' >> "${SOURCE_DIRECTORY}/lua.pc" &&
+cat "${SPELL_DIRECTORY}/lua.pc.in" >> "${SOURCE_DIRECTORY}/lua.pc"
diff --git a/lua-forge/lua/lua.pc b/lua-forge/lua/lua.pc
deleted file mode 100644
index 79137cd..0000000
--- a/lua-forge/lua/lua.pc
+++ /dev/null
@@ -1,31 +0,0 @@
-# lua.pc -- pkg-config data for Lua
-
-# vars from install Makefile
-
-# grep '^V=' ../Makefile
-V= 5.3
-# grep '^R=' ../Makefile
-R= 5.3.1
-
-# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/'
-prefix= /usr
-INSTALL_BIN= ${prefix}/bin
-INSTALL_INC= ${prefix}/include
-INSTALL_LIB= ${prefix}/lib
-INSTALL_MAN= ${prefix}/share/man/man1
-INSTALL_LMOD= ${prefix}/share/lua/${V}
-INSTALL_CMOD= ${prefix}/lib/lua/${V}
-
-# canonical vars
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Lua
-Description: An Extensible Extension Language
-Version: ${R}
-Requires: 
-Libs: -L${libdir} -llua -lm
-Cflags: -I${includedir}
-
-# (end of lua.pc)
diff --git a/lua-forge/lua/lua.pc.in b/lua-forge/lua/lua.pc.in
new file mode 100644
index 0000000..859b10f
--- /dev/null
+++ b/lua-forge/lua/lua.pc.in
@@ -0,0 +1,13 @@
+# canonical vars
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+
+Name: Lua
+Description: An Extensible Extension Language
+Version: ${R}
+Requires: 
+Libs: -L${libdir} -llua -lm
+Cflags: -I${includedir}
+
+# (end of lua.pc)