diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-07-10 13:24:17 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2014-07-10 13:30:26 +0100 |
| commit | 7413c75b71cb44c5c86a297a3e02784c9f347212 (patch) | |
| tree | 92ffd4145bfabbf938040f5da4b13aa647ed99f1 | |
| parent | 06e696a043114fcaba005cd8feac0ecb7ecede4a (diff) | |
Cleanup configure's make recommendations for stale make versions.
Change-Id: Ib0c546e835bd3e6961632d4644901436061dc072
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 5d25cf78a755..490097a88fe3 100644 --- a/configure.ac +++ b/configure.ac @@ -13068,6 +13068,14 @@ fi if test "$STALE_MAKE" = "TRUE" -a "$build_os" = "cygwin"; then + +cygwin_arch=`echo $MACHTYPE | sed 's/-.*//'` +if test "$cygwin_arch" = "x86_64"; then + download_make_url=http://users.freedesktop.org/~michael/x86_64/make +else + download_make_url=http://dev-www.libreoffice.org/bin/cygwin/make +fi + cat << _EOS **************************************************************************** WARNING: @@ -13078,14 +13086,15 @@ 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 +wget $download_make_url chmod +x make to install from source: place yourself in a working directory of you choice. -git clone git://anongit.freedesktop.org/libreoffice/contrib/dev-tools -cd dev-tools/make-3.82-gbuild +git clone https://gerrit.libreoffice.org/p/gnu-make-lo.git +cd gnu-make-lo +autoreconf -i ./configure --prefix=/opt/lo make make install |