diff src/texinfo.mk @ 3609:360eff7d9c06

texinfo: compile native info when native target. * src/mingw-texinfo-1-fixes.patch: define sleep in mingw. * src/texinfo.mk: only build tools libs for cross build ginfo when doing cross build.
author John Donoghue
date Mon, 09 Jun 2014 08:11:22 -0400
parents 1dbcd8e81b6a
children 28a83a566666
line wrap: on
line diff
--- a/src/texinfo.mk	Mon Jun 09 08:18:39 2014 -0400
+++ b/src/texinfo.mk	Mon Jun 09 08:11:22 2014 -0400
@@ -34,11 +34,16 @@
     $(MAKE) -C '$(1).build/makeinfo' -j 1 install DESTDIR='$(3)'
 
     # octave-cli needs info to display help
-    # need build native tools in order to build info
-    $(MAKE) -C '$(1).build/tools/lib' -j $(JOBS) 
-    $(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
-    $(MAKE) -C '$(1).build/info' -j '$(JOBS)' ginfo.exe
-    $(INSTALL) '$(1).build/info/ginfo.exe' '$(3)$(HOST_BINDIR)/info.exe'
+    # for cross build, need build native tools in order to build info
+    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 \
+        $(MAKE) -C '$(1).build/tools/lib' -j $(JOBS); \
+        $(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; \
+        $(MAKE) -C '$(1).build/info' -j '$(JOBS)' ginfo.exe; \
+        $(INSTALL) '$(1).build/info/ginfo.exe' '$(3)$(HOST_BINDIR)/info.exe'; \
+    fi
 endef