[PATCH] configure: fix python-cffi out-of-tree build

Subject: [PATCH] configure: fix python-cffi out-of-tree build

Date: Mon, 15 Feb 2021 23:54:10 +0200

To: notmuch@notmuchmail.org

Cc: tomi.ollila@iki.fi

From: Tomi Ollila

In case of out of tree build:

* Copy version.txt and lib/notmuch.h to the root of the python-cffi
  bindings directory (in addtion to the files already copied there)

* Modify _build.py to refer '.' instead of '../../lib' for searching
  c include files

While at it, fixed indentation in related lines from 7 spaces to one
tab (like indentation done elsewhere in the same file).
---
 configure | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index cfa9c09b..11605942 100755
--- a/configure
+++ b/configure
@@ -75,9 +75,14 @@ if [ "$srcdir" != "." ]; then
     # out-of-tree builds (again, not ideal).
     mkdir bindings/python-cffi
     cp -a "$srcdir"/bindings/python-cffi/tests \
-       "$srcdir"/bindings/python-cffi/notmuch2 \
-       "$srcdir"/bindings/python-cffi/setup.py \
-       bindings/python-cffi/
+	"$srcdir"/bindings/python-cffi/notmuch2 \
+	"$srcdir"/bindings/python-cffi/setup.py \
+	"$srcdir"/bindings/python-cffi/version.txt \
+	"$srcdir"/lib/notmuch.h \
+	bindings/python-cffi/
+    sed "/include_dirs=/ s|'[.][.]/[.][.]/lib'|'.'|" \
+	bindings/python-cffi/notmuch2/_build.py > _build.py.wip
+    mv _build.py.wip bindings/python-cffi/notmuch2/_build.py
 fi
 
 # Set several defaults (optionally specified by the user in
-- 
2.29.2

_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Thread: