# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1603367436 -7200
# Node ID 31f2d5949b0e630cbc8a7038ddb5a3e55ce1665b
# Parent  77c1dd074c68626cb814e853b715d9cf507b545b
Do not install Octave in separate folder.

* src/default-octave.mk, src/release-octave.mk, src/stable-octave.mk: Do not
  install Octave additionally in TOP_BUILD_DIR. It is already installed at
  HOST_PREFIX.

diff -r 77c1dd074c68 -r 31f2d5949b0e src/default-octave.mk
--- a/src/default-octave.mk	Thu Oct 01 11:36:02 2020 +0200
+++ b/src/default-octave.mk	Thu Oct 22 13:50:36 2020 +0200
@@ -194,9 +194,6 @@
 
     $(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.
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
 
     if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
@@ -213,10 +210,7 @@
         $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
     fi
 
-    if [ $(MXE_SYSTEM) != msvc ]; then \
-        $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_BUILD_DIR)/octave install; \
-    fi
-
     # create a file with latest installed octave rev in it
+    mkdir -p '$(TOP_BUILD_DIR)/octave'
     echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
 endef
diff -r 77c1dd074c68 -r 31f2d5949b0e src/release-octave.mk
--- a/src/release-octave.mk	Thu Oct 01 11:36:02 2020 +0200
+++ b/src/release-octave.mk	Thu Oct 22 13:50:36 2020 +0200
@@ -215,9 +215,6 @@
 
     $(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.
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
 
     if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
@@ -234,10 +231,7 @@
         $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
     fi
 
-    if [ $(MXE_SYSTEM) != msvc ]; then \
-        $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_BUILD_DIR)/octave install; \
-    fi
-
     # create a file with latest installed octave rev in it
+    mkdir -p '$(TOP_BUILD_DIR)/octave'
     echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
 endef
diff -r 77c1dd074c68 -r 31f2d5949b0e src/stable-octave.mk
--- a/src/stable-octave.mk	Thu Oct 01 11:36:02 2020 +0200
+++ b/src/stable-octave.mk	Thu Oct 22 13:50:36 2020 +0200
@@ -194,9 +194,6 @@
 
     $(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.
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'
 
     if [ "x$(MXE_SYSTEM)" == "xmingw" ]; then \
@@ -213,10 +210,7 @@
         $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(3) install-pdf install-html; \
     fi
 
-    if [ $(MXE_SYSTEM) != msvc ]; then \
-        $(MAKE) -C '$(1)/.build' -j '$(JOBS)' DESTDIR=$(TOP_BUILD_DIR)/octave install; \
-    fi
-
     # create a file with latest installed octave rev in it
+    mkdir -p '$(TOP_BUILD_DIR)/octave'
     echo "$($(PKG)_VERSION)" > $(TOP_BUILD_DIR)/octave/octave-version
 endef