Mercurial > mxe-octave

changeset 4840:21e184cc4fd7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/texinfo.mk: Dont install own info.exe when using msys2 (Bug #54604)
author John Donoghue
date Wed, 05 Sep 2018 15:02:20 -0400
parents 70c3f4bcac22
children 96b51259775c
files src/texinfo.mk
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/texinfo.mk	Wed Sep 05 10:57:47 2018 -0400
+++ b/src/texinfo.mk	Wed Sep 05 15:02:20 2018 -0400
@@ -44,10 +44,12 @@
 
     # octave-cli needs info to display help
     # for cross build, need build native tools in order to build info
+    # for cross build that will use msys2, we do not need info as wil use
+    # the msys2 version
     if [ "x$(MXE_NATIVE_BUILD)" = "xyes" ]; then \
         $(MAKE) -C '$(1).build/info' -j '$(JOBS)'; \
         $(MAKE) -C '$(1).build/info' -j 1 install DESTDIR='$(3)'; \
-    else \
+    elif [ "x$(USE_MSYS2)" = "xno" ]; then \
         $(MAKE) -C '$(1).build/tools/gnulib/lib' -j $(JOBS); \
         $(MAKE) -C '$(1).build/tools/info' -j $(JOBS) makedoc; \
         $(MAKE) -C '$(1).build/info' -j 1 funs.h; \