Merge branch 'master' into zlib

2 files changed, 13 insertions, 9 deletions

diff --git a/packages/libxml2.sh b/packages/libxml2.sh
index 88d1b73..6bc00c8 100644
--- a/packages/libxml2.sh
+++ b/packages/libxml2.sh
@@ -1,4 +1,4 @@
-SRCURL=git://git.gnome.org/libxml2
+SRCURL=https://gitlab.gnome.org/GNOME/libxml2.git
 
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 974d66c..2383724 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -18,6 +18,10 @@ function common_build_init {
         export envname=${package}
     fi
 
+    if [[ "${MAKE}" == "" ]]; then
+        export MAKE="make"
+    fi
+
     export srcdir=$(realpath "${dir}/../src/${package}")
     if [ ! -d "${srcdir}" ]; then
         echo "Error: Package sources directory not exists for package '${package}'."
@@ -111,8 +115,8 @@ function run_autoreconf {
     echo "cd ${srcdir}/${SUBDIR}"
     cd "${srcdir}/${SUBDIR}"
     check_error $?
-    echo "make distclean"
-    make distclean
+    echo "${MAKE} distclean"
+    ${MAKE} distclean
     echo "autoreconf ${flags}"
     autoreconf  ${flags}
     unset flags
@@ -169,21 +173,21 @@ function run_make {
     if [[ "${jobs}" == "" ]]; then
         if [ -f "/proc/cpuinfo" ]; then
             jobs="$(cat /proc/cpuinfo|grep processor|wc -l)"
+            j=" -j${jobs}"
         else
-            jobs="1"
+            j=""
         fi
     fi
-    j=" -j${jobs}"
 
-    echo "make$j"
-    make$j
+    echo "${MAKE}$j"
+    ${MAKE}$j
     check_error $?
     unset j
 }
 
 function run_make_install {
-    echo "make install"
-    make install
+    echo "${MAKE} install"
+    ${MAKE} install
     check_error $?
 }