Mercurial > mxe-octave

diff src/texinfo.mk @ 3578:583d3bf548e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
texinfo: update to 5.2 and install all tools * src/texinfo.mk: update to 5.2 and make/make install all. * src/texinfo-1-fixes.patch: updated patch for 5.2.
author John Donoghue <john.donoghue@ieee.org>
date Tue, 15 Apr 2014 21:32:17 -0400
parents 8d5ea2642115
children 63798d0032c2
line wrap: on
line diff
--- a/src/texinfo.mk	Wed Mar 19 20:54:18 2014 -0400
+++ b/src/texinfo.mk	Tue Apr 15 21:32:17 2014 -0400
@@ -3,10 +3,10 @@
 
 PKG             := texinfo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.13a
-$(PKG)_CHECKSUM := a1533cf8e03ea4fa6c443b73f4c85e4da04dead0
-$(PKG)_SUBDIR   := $(PKG)-4.13
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_VERSION  := 5.2
+$(PKG)_CHECKSUM := dc54edfbb623d46fb400576b3da181f987e63516
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $($(PKG)_SUBDIR).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
 $(PKG)_DEPS     := # libgnurx
 
@@ -20,12 +20,9 @@
     cd '$(1).build' && '$(1)/configure' \
         $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
-        --prefix='$(HOST_PREFIX)'
+        --prefix='$(HOST_PREFIX)' LIBS='-lpthread -lws2_32'
 
-    ## All we need for Octave is makeinfo.
-    $(MAKE) -C '$(1).build/lib' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build/gnulib/lib' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build/makeinfo' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build' -j '$(JOBS)'
 
-    $(MAKE) -C '$(1).build/makeinfo' -j '$(JOBS)' install DESTDIR='$(3)'
+    $(MAKE) -C '$(1).build' -j '1' install DESTDIR='$(3)'
 endef