config_host.mk.in | 1 -
configure.ac | 1 -
2 files changed, 2 deletions(-)
New commits:
commit c184e32d5976e751b8d08577bd256232a67917c5
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Thu Sep 18 21:40:47 2014 +0200
$(GNUMAKE) is not used outside of a configure
f8062812ae76af9488bc9c64ee9365c747bd3b38 replaced it with $(MAKE)
Change-Id: Ibe13cb6d93489a15bcb8c43b113b125bfbe5820f
diff --git a/config_host.mk.in b/config_host.mk.in
index 40865e7..e717745 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -213,7 +213,6 @@ export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@
export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@
export PARALLELISM?=@PARALLELISM@
@x_GNUCP@ export GNUCOPY=@GNUCP@
-export GNUMAKE=@GNUMAKE@
export GNUMAKE_WIN_NATIVE=@GNUMAKE_WIN_NATIVE@
export GNUPATCH=@GNUPATCH@
export GNUTAR=@GNUTAR@
diff --git a/configure.ac b/configure.ac
index 23a1f20..e5c01e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4867,7 +4867,6 @@ else
fi
rm -rf $TESTGMAKEFILEFUNC
AC_SUBST(HAVE_GNUMAKE_FILE_FUNC)
-AC_SUBST(GNUMAKE)
AC_SUBST(GNUMAKE_WIN_NATIVE)
_make_ver_check=`$GNUMAKE --version | grep "Built for Windows"`
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
