[Libreoffice-commits] core.git: configure.ac

Mathias Hasselmann mathias at openismus.com
Sat Mar 23 03:08:36 PDT 2013


 configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d48d67b06f9f0c144bc84155ba0f891041d109f
Author: Mathias Hasselmann <mathias at openismus.com>
Date:   Sat Mar 23 10:19:18 2013 +0100

    Use the make binary that configure found in PATH
    
    When auto-detecting the GNU make binary from PATH store its absolute
    path in the GNUMAKE variable to ensure to keep using exactly the same
    GNU make binary even when the PATH settings change. This is needed
    because the gbuild system relies on the GNU make features detected and
    reported by the configure script.
    
    Change-Id: I05916f0ad7f2e98e4e908455ed72758ebf396863
    Reviewed-on: https://gerrit.libreoffice.org/2924
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>

diff --git a/configure.ac b/configure.ac
index 7cd27f0..ebb26a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4494,7 +4494,7 @@ for a in "$MAKE" "$GNUMAKE" make gmake gnumake; do
     if test -n "$a"; then
         $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
         if test $? -eq 0;  then
-            GNUMAKE=$a
+            GNUMAKE=`which $a`
             break
         fi
     fi


More information about the Libreoffice-commits mailing list