Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 FUNCTIONS              |    4 ++--
 editors/texmaker/BUILD |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1cc004e71106bc8c7f553edf0f33d3e2e3ad341b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    texmaker: Fix installation directory

commit a16f293012d0d7219151ec099af7794336a21780
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    FUNCTIONS: Generalize qt[45]_build install dir
    
    Take the installation directory as first argument.

diff --git a/FUNCTIONS b/FUNCTIONS
index fc2bd21..9c87d40 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -10,7 +10,7 @@ qt5_build() {
 # qmake uses its own flag settings
   export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
   qmake QMAKE_CONFIG="$OPTS" QMAKE_CFLAGS="$CFLAGS" 
QMAKE_CXXFLAGS="$CXXFLAGS"\
-    PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib *.pro &&
+    PREFIX=${1-$QT5DIR} LIBDIR=$QT5DIR/lib *.pro &&
   make
 }
 
@@ -610,7 +610,7 @@ qt4_cmake_build() {
 
 qt4_build() {
   PATH="$QT4DIR/bin:$PATH"
-  qmake PREFIX=$QT4DIR $OPTS *.pro &&
+  qmake PREFIX=${1-$QT4DIR} $OPTS *.pro &&
   make
 }
 
diff --git a/editors/texmaker/BUILD b/editors/texmaker/BUILD
index cb0b4d7..7585a00 100755
--- a/editors/texmaker/BUILD
+++ b/editors/texmaker/BUILD
@@ -1,5 +1,5 @@
 if is_depends_enabled $SPELL qtbase; then
-  qt5_build
+  qt5_build "$INSTALL_ROOT/usr"
 else
-  qt4_build
+  qt4_build "$INSTALL_ROOT/usr"
 fi