Mercurial > mxe-octave

changeset 3493:8d5ea2642115

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
back down to texinfo 4.3
author John W. Eaton <jwe@octave.org>
date Mon, 03 Feb 2014 18:11:00 -0500
parents a714ce7042c0
children fb7ca379f593
files src/build-texinfo.mk src/texinfo.mk
diffstat 2 files changed, 23 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/build-texinfo.mk	Mon Feb 03 18:47:17 2014 -0500
+++ b/src/build-texinfo.mk	Mon Feb 03 18:11:00 2014 -0500
@@ -3,10 +3,10 @@
 
 PKG             := build-texinfo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.2
-$(PKG)_CHECKSUM := fbbc35c5857d11d1164c8445c78b66ad6d472072
-$(PKG)_SUBDIR   := texinfo-$($(PKG)_VERSION)
-$(PKG)_FILE     := texinfo-$($(PKG)_VERSION).tar.xz
+$(PKG)_VERSION  := 4.13a
+$(PKG)_CHECKSUM := a1533cf8e03ea4fa6c443b73f4c85e4da04dead0
+$(PKG)_SUBDIR   := texinfo-4.13
+$(PKG)_FILE     := texinfo-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
 $(PKG)_DEPS     := 
 
@@ -20,6 +20,13 @@
     cd    '$(1).build' && '$(1)/configure' \
         --prefix='$(BUILD_TOOLS_PREFIX)'
 
-    $(MAKE) -C '$(1).build' -j '$(JOBS)'
-    $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)'
+    $(MAKE) -C '$(1).build/gnulib/lib' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build/lib' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build/makeinfo' -j '$(JOBS)'
+    $(MAKE) -C '$(1).build/util' -j '$(JOBS)'
+
+    $(MAKE) -C '$(1).build/gnulib/lib' -j 1 install DESTDIR='$(3)'
+    $(MAKE) -C '$(1).build/lib' -j 1 install DESTDIR='$(3)'
+    $(MAKE) -C '$(1).build/makeinfo' -j 1 install DESTDIR='$(3)'
+    $(MAKE) -C '$(1).build/util' -j 1 install DESTDIR='$(3)'
 endef
--- a/src/texinfo.mk	Mon Feb 03 18:47:17 2014 -0500
+++ b/src/texinfo.mk	Mon Feb 03 18:11:00 2014 -0500
@@ -3,10 +3,10 @@
 
 PKG             := texinfo
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 5.2
-$(PKG)_CHECKSUM := fbbc35c5857d11d1164c8445c78b66ad6d472072
-$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.xz
+$(PKG)_VERSION  := 4.13a
+$(PKG)_CHECKSUM := a1533cf8e03ea4fa6c443b73f4c85e4da04dead0
+$(PKG)_SUBDIR   := $(PKG)-4.13
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE)
 $(PKG)_DEPS     := # libgnurx
 
@@ -22,10 +22,10 @@
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$(HOST_PREFIX)'
 
-    for d in gnulib/lib install-info tp util; do \
-      $(MAKE) -C '$(1).build' -C $$d -j '$(JOBS)'; \
-    done
-    for d in gnulib/lib install-info tp util; do \
-      $(MAKE) -C '$(1).build' -C $$d -j '$(JOBS)' install DESTDIR='$(3)'; \
-    done
+    ## 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/makeinfo' -j '$(JOBS)' install DESTDIR='$(3)'
 endef