changeset 6521:fe9ef30a38dd

* src/arpack.mk: fix DESTDIR value for install in native msys vs others
author John Donoghue <john.donoghue@ieee.org>
date Wed, 16 Nov 2022 08:43:42 -0500
parents 56decd595eb7
children a2d0ea5e6b2b
files src/arpack.mk
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/arpack.mk	Wed Nov 16 08:27:17 2022 +0100
+++ b/src/arpack.mk	Wed Nov 16 08:43:42 2022 -0500
@@ -9,16 +9,11 @@
 $(PKG)_FILE     := arpack-ng_$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := https://github.com/opencollab/arpack-ng/archive/$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := blas lapack
-$(PKG)_DESTDIR  := '$(3)'
 
 ifeq ($(MXE_NATIVE_BUILD),yes)
   $(PKG)_CONFIGURE_ENV := LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
 endif
 
-ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
-  $(PKG)_DESTDIR := 
-endif
-
 ifeq ($(USE_PIC_FLAG),yes)
   $(PKG)_CONFIGURE_PIC_OPTION := --with-pic
 endif
@@ -46,5 +41,9 @@
         $($(PKG)_ENABLE_64_CONFIGURE_OPTIONS) && $(CONFIGURE_POST_HOOK)
 
     $(MAKE) -C '$(1)/.build' -j '$(JOBS)'
-    $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$($(PKG)_DESTDIR)'
+    if [ "$(MXE_NATIVE_MINGW_BUILD)" = yes ]; then \
+      $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install; \
+    else \
+      $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install DESTDIR='$(3)'; \
+    fi
 endef