Mercurial > mxe-octave
changeset 3993:3a38544f2a8f
default-octave: update cur current dev branch build
* src/default-octave-1-docinstall.patch: remove patch
* dist-files.mk: removed default-octave-1-docinstall.patch
* src/default-octave.mk: build libgnu first
| author | John D |
|---|---|
| date | Mon, 27 Jul 2015 22:00:58 -0400 |
| parents | 317642e93df5 |
| children | 5664a1961f45 |
| files | dist-files.mk src/default-octave-1-docinstall.patch src/default-octave.mk |
| diffstat | 3 files changed, 2 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Sat Jul 11 19:48:48 2015 -0400 +++ b/dist-files.mk Mon Jul 27 22:00:58 2015 -0400 @@ -60,7 +60,6 @@ dcmtk-1-fixes.patch \ dcmtk-2-ming64.patch \ dcmtk.mk \ - default-octave-1-docinstall.patch \ default-octave-1-fixes.patch \ default-octave.mk \ devil-1-png.patch \
--- a/src/default-octave-1-docinstall.patch Sat Jul 11 19:48:48 2015 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ -diff -ur a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in ---- a/doc/interpreter/Makefile.in 2013-12-27 17:01:52.000000000 -0500 -+++ b/doc/interpreter/Makefile.in 2014-01-21 12:47:59.618865568 -0500 -@@ -2435,8 +2435,10 @@ - if test -d "$$d2"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ - $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ -- echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ -- $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ -+ for htm in "$$d2"/*; do \ -+ echo " $(INSTALL_DATA) '$$htm' '$(DESTDIR)$(htmldir)/$$f'"; \ -+ $(INSTALL_DATA) "$$htm" "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ -+ done; \ - else \ - list2="$$list2 $$d2"; \ - fi; \
--- a/src/default-octave.mk Sat Jul 11 19:48:48 2015 -0400 +++ b/src/default-octave.mk Mon Jul 27 22:00:58 2015 -0400 @@ -142,6 +142,8 @@ PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \ && $(CONFIGURE_POST_HOOK) + $(MAKE) -C '$(1)/.build/libgnu' + ## We want both of these install steps so that we install in the ## location set by the configure --prefix option, and the other ## in a directory tree that will have just Octave files.