summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2018-10-24 15:39:16 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2018-10-24 15:39:16 +0200
commitf84f0c623cd2652fcf80ec47cb287cc29fd430c5 (patch)
tree3c1b207ac87f92aca125ddeb5760c8c9e90528c9
parenteb97daad97596d54e0da8987ef1c5b1dd91c124f (diff)
downloadastra-f84f0c623cd2652fcf80ec47cb287cc29fd430c5.tar.gz
astra-f84f0c623cd2652fcf80ec47cb287cc29fd430c5.tar.bz2
astra-f84f0c623cd2652fcf80ec47cb287cc29fd430c5.tar.xz
astra-f84f0c623cd2652fcf80ec47cb287cc29fd430c5.zip
Fix missing python lib path for matlab module
-rw-r--r--build/linux/Makefile.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in
index f4c5c20..13e1344 100644
--- a/build/linux/Makefile.in
+++ b/build/linux/Makefile.in
@@ -81,11 +81,16 @@ endif
ifeq ($(python),yes)
PYTHON = @PYTHON@
PYINCDIR := $(shell $(PYTHON) -c 'from __future__ import print_function; from distutils.sysconfig import get_python_inc; print(get_python_inc())')
+PYLIBDIR := $(shell $(PYTHON) -c 'from distutils.sysconfig import get_config_var; import six; six.print_(get_config_var("LIBDIR"))')
PYLIBVER = `basename $(PYINCDIR)`
CPPFLAGS += -DASTRA_PYTHON -I$(PYINCDIR)
PYCPPFLAGS := $(CPPFLAGS)
PYCPPFLAGS += -I../include
-PYLDFLAGS = $(MODLDFLAGS)
+
+# copy the current MODLDFLAGS to PYLDFLAGS, and then add flags for matlab/octave
+PYLDFLAGS := $(MODLDFLAGS)
+MODLDFLAGS += -L$(PYLIBDIR)
+
MODPYLIBS=-l$(PYLIBVER)
endif