# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1637839668 -3600
# Node ID 93e18f23ccc9622d4ab35bbb6444adfa22431ea3
# Parent  15322fbad67ca35d112974fbc1fd2ed81d3721c8
stable-octave.mk: Use quoted paths for potential spaces after relocation.

* src/stable-octave.mk: Merge changes from src/default-octave.mk.

diff -r 15322fbad67c -r 93e18f23ccc9 src/stable-octave.mk
--- a/src/stable-octave.mk	Thu Nov 25 11:36:10 2021 +0100
+++ b/src/stable-octave.mk	Thu Nov 25 12:27:48 2021 +0100
@@ -117,6 +117,21 @@
   $(PKG)_ENABLE_FORTRAN_INT64_CONFIGURE_OPTIONS := ax_blas_f77_func_ok=yes ax_blas_integer_size=4 octave_cv_sizeof_fortran_integer=4
 endif
 
+ifeq ($(MXE_SYSTEM),mingw)
+  # This is very similar to CONFIGURE_CPPFLAGS and CONFIGURE_LDFLAGS but with
+  # double quoted paths.
+  $(PKG)_CONFIGURE_CPPFLAGS := CPPFLAGS='-I"$(HOST_PREFIX)/include"'
+  ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
+    $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib" -L"$(HOST_PREFIX)/lib64"'
+  else
+    $(PKG)_CONFIGURE_LDFLAGS := LDFLAGS='-L"$(HOST_PREFIX)/lib"'
+  endif
+else
+  $(PKG)_CONFIGURE_CPPFLAGS := $(CONFIGURE_CPPFLAGS)
+  $(PKG)_CONFIGURE_LDFLAGS := $(CONFIGURE_LDFLAGS)
+endif
+
+
 ifeq ($(MXE_SYSTEM),msvc)
   $(PKG)_PREFIX := '$(HOST_PREFIX)/local/$($(PKG)_SUBDIR)'
   # - Enable atomic refcount (required for QtHandles)
@@ -131,8 +146,13 @@
     CXXFLAGS='-O2 -wd4244 -wd4003 -wd4005 -wd4068'
 else
   $(PKG)_PREFIX := '$(HOST_PREFIX)'
-  $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
-    LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
+  ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+      LDFLAGS='-Wl,-rpath-link,"$(HOST_LIBDIR)" -L"$(HOST_LIBDIR)" -L"$($(PKG)_QTDIR)/lib"'
+  else
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS := \
+      LDFLAGS='-Wl,-rpath-link,$(HOST_LIBDIR) -L$(HOST_LIBDIR) -L$($(PKG)_QTDIR)/lib'
+  endif
 endif
 
 ifeq ($(MXE_SYSTEM),mingw)
@@ -174,7 +194,8 @@
 
     mkdir '$(1)/.build'
     cd '$(1)/.build' && $($(PKG)_CONFIGURE_ENV) '$(1)/configure' \
-        $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \
+        $($(PKG)_CONFIGURE_CPPFLAGS) \
+        $($(PKG)_CONFIGURE_LDFLAGS) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         --prefix='$($(PKG)_PREFIX)' \
         --disable-silent-rules \