From c1f3492e0ba9a985cd786fc975670c31bc2e8a4c Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Mon, 15 Jul 2019 23:43:16 +0100
Subject: [PATCH 4/4] Build python bits in the source tree
---
src/neuronmusic/setup.py.in | 2 +-
src/nrnpython/setup.py.in | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/neuronmusic/setup.py.in b/src/neuronmusic/setup.py.in
index ddc21c68..9a91d421 100644
--- a/src/neuronmusic/setup.py.in
+++ b/src/neuronmusic/setup.py.in
@@ -29,6 +29,6 @@ neuronmusic_module = Extension(
setup(name="neuronmusic", version="@PACKAGE_VERSION@",
description = "NEURON+MUSIC python interface",
- package_dir = {'':instdir+'/share/nrn/lib/python'},
+ package_dir = {'':nrn_srcdir+'/share/nrn/lib/python'},
ext_modules=[neuronmusic_module]
)
diff --git a/src/nrnpython/setup.py.in b/src/nrnpython/setup.py.in
index 19bec5f2..3e2560a1 100644
--- a/src/nrnpython/setup.py.in
+++ b/src/nrnpython/setup.py.in
@@ -19,7 +19,6 @@ destdir = os.getenv("DESTDIR")
if not destdir:
destdir = ""
-instdir = destdir + "@prefix@"
if nrn_srcdir[0] != '/' :
nrn_srcdir = '../../' + nrn_srcdir
@@ -125,7 +124,7 @@ if build_rx3d:
setup(name="NEURON", version="@PACKAGE_VERSION@",
description = "NEURON bindings for python",
- package_dir = {'':instdir+'/share/nrn/lib/python'},
+ package_dir = {'':nrn_srcdir+'/share/lib/python'},
packages=packages,
data_files = [('neuron', [nrn_srcdir + '/share/lib/python/neuron/help_data.dat'])],
ext_modules=ext_modules
--
2.21.0