[Libreoffice-commits] .: 2 commits - configure.in set_soenv.in

[Norbert Thiebaud]

 configure.in |    8 ++++++++
 set_soenv.in |   24 +++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

New commits:
commit 9092f1f0d363246a88853ee1ad38a698ba2eebb1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Sep 10 18:36:32 2011 -0500

    provide instructions to install a linreoffice-custom gnumake

diff --git a/set_soenv.in b/set_soenv.in
index 8528184..7ec8d3e 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2093,11 +2093,29 @@ if ("@STALE_MAKE@" eq "TRUE" && $platform =~ m/cygwin/ ) {
 print << 'EOS'
 WARNING:
 Your make version is known to be horribly slow, and hard to debug
-problems with. To get a reasonably functional make please run:
+problems with. To get a reasonably functional make please do:
 
-$ <three commands to be supplied by Norbert>
+to install a pre-compiled binary make for cygwin
+
+mkdir -p /opt/lo/bin
+cd /opt/lo/bin
+wget http://dev-www.libreoffice.org/bin/cygwin/make
+chmod +x make
+
+to install from source:
+place yourself in a working directory of you choice.
+
+git clone git://anongitfreedesktop.org/libreoffice/contrib/dev-tools
+cd dev-tools/make-3.82-gbuild
+./configure --prefix=/opt/lo
+make
+sudo make install
+
+Then re-run autogen.sh
+
+Note: autogen.sh will try to use /opt/lo/bin/make if the environment variable GNUMAKE is not already defined.
+Alternatively, you can install the 'new' make where ever you want and make sure that `which make` finds it.
 
-before building.
 EOS
 }
 
commit ab32bfd3ce3b21a7debfbdc41b5653dabf9b1389
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sat Sep 10 18:35:43 2011 -0500

    try to use our 'own' make if installed in /opt/lo/bin/make
    
    if GNUMAKE is undefined and /opt/lo/bin/make is an executable
    then define GNUMAKE as /opt/lo/bin/make

diff --git a/configure.in b/configure.in
index 9de186e..4fb2156 100755
--- a/configure.in
+++ b/configure.in
@@ -2515,6 +2515,14 @@ dnl ===================================================================
 dnl Search all the common names for GNU make
 dnl ===================================================================
 AC_MSG_CHECKING([for GNU make])
+
+# try to use our own make if it is available and GNUMAKE was not already defined
+if test -z "$GNUMAKE"; then
+    if test -x "/opt/lo/bin/make"; then
+        GNUMAKE="/opt/lo/bin/make"
+    fi
+fi
+
 for a in "$MAKE" $GNUMAKE make gmake gnumake; do
     $a --version 2> /dev/null | grep GNU  2>&1 > /dev/null
     if test $? -eq 0;  then