# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1357192241 18000
# Node ID fc124629c527bdf7d22742d2fec4a219451b1917
# Parent  8cf0cbcdaeeab3768178b155f68b39251c460bf8
backout changeset 0adbff7dec24

diff -r 8cf0cbcdaeea -r fc124629c527 src/octave.mk
--- a/src/octave.mk	Wed Jan 02 20:43:23 2013 -0500
+++ b/src/octave.mk	Thu Jan 03 00:50:41 2013 -0500
@@ -32,6 +32,9 @@
         FLTK_CONFIG="$(PREFIX)/bin/$(TARGET)-fltk-config" \
         gl_cv_func_gettimeofday_clobber=no
 
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
-    $(MAKE) -C '$(1)/.build' -j 1 DESTDIR=$(PREFIX)/../octave install
+    ## 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.
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(PREFIX)/../octave install
 endef