# HG changeset patch
# User John D
# Date 1438048858 14400
# Node ID 3a38544f2a8f7fc1ea3ef71b1fd281338f257037
# Parent  317642e93df534b7b1aaf393e9cbd72995d92436
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

diff -r 317642e93df5 -r 3a38544f2a8f dist-files.mk
--- 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 \
diff -r 317642e93df5 -r 3a38544f2a8f src/default-octave-1-docinstall.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; \
diff -r 317642e93df5 -r 3a38544f2a8f src/default-octave.mk
--- 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.