changeset 3117:fc124629c527

backout changeset 0adbff7dec24
author John W. Eaton <jwe@octave.org>
date Thu, 03 Jan 2013 00:50:41 -0500
parents 8cf0cbcdaeea
children eaa776e7b27a
files src/octave.mk
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/octave.mk
+++ b/src/octave.mk
@@ -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