Mercurial > mxe-octave
changeset 3475:81544b3fe0ca
update to texinfo 5.2
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 31 Jan 2014 11:47:59 -0500 |
parents | 90e45130eab8 |
children | f38cc7e463d5 |
files | index.html src/build-texinfo.mk src/texinfo.mk |
diffstat | 3 files changed, 18 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/index.html Fri Jan 31 11:45:39 2014 -0500 +++ b/index.html Fri Jan 31 11:47:59 2014 -0500 @@ -1053,7 +1053,7 @@ </tr> <tr> <td id="build-texinfo-package">texinfo</td> - <td id="build-texinfo-version">4.13a</td> + <td id="build-texinfo-version">5.2</td> <td id="build-texinfo-website"><a href="http://www.gnu.org/software/texinfo">texinfo</a></td> </tr> <tr> @@ -2359,7 +2359,7 @@ </tr> <tr> <td id="texinfo-package">texinfo</td> - <td id="texinfo-version">4.13a</td> + <td id="texinfo-version">5.2</td> <td id="texinfo-website"><a href="http://www.gnu.org/software/texinfo/">GNU Texinfo</a></td> </tr> <tr>
--- a/src/build-texinfo.mk Fri Jan 31 11:45:39 2014 -0500 +++ b/src/build-texinfo.mk Fri Jan 31 11:47:59 2014 -0500 @@ -3,9 +3,9 @@ PKG := build-texinfo $(PKG)_IGNORE := -$(PKG)_CHECKSUM := a1533cf8e03ea4fa6c443b73f4c85e4da04dead0 -$(PKG)_SUBDIR := texinfo-4.13 -$(PKG)_FILE := texinfo-$($(PKG)_VERSION).tar.gz +$(PKG)_CHECKSUM := fbbc35c5857d11d1164c8445c78b66ad6d472072 +$(PKG)_SUBDIR := texinfo-$($(PKG)_VERSION) +$(PKG)_FILE := texinfo-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE) $(PKG)_DEPS := @@ -19,13 +19,6 @@ cd '$(1).build' && '$(1)/configure' \ --prefix='$(BUILD_TOOLS_PREFIX)' - $(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)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install DESTDIR='$(3)' endef
--- a/src/texinfo.mk Fri Jan 31 11:45:39 2014 -0500 +++ b/src/texinfo.mk Fri Jan 31 11:47:59 2014 -0500 @@ -3,9 +3,9 @@ PKG := texinfo $(PKG)_IGNORE := -$(PKG)_CHECKSUM := a1533cf8e03ea4fa6c443b73f4c85e4da04dead0 -$(PKG)_SUBDIR := $(PKG)-4.13 -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_CHECKSUM := fbbc35c5857d11d1164c8445c78b66ad6d472072 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/gnu/texinfo/$($(PKG)_FILE) $(PKG)_DEPS := # libgnurx @@ -15,14 +15,16 @@ endef define $(PKG)_BUILD - mkdir '$(1)/.build' - cd '$(1)/.build' && '$(1)/configure' \ + mkdir '$(1).build' + cd '$(1).build' && '$(1)/configure' \ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \ --prefix='$(HOST_PREFIX)' - ## 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)' install DESTDIR='$(3)' + 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 endef