summaryrefslogtreecommitdiffstats
path: root/patches/libdmtx-0.7.2/0001-fix-search-paths-when-building-python-bindings.patch
blob: 5eed2635d381da703faf40f254be4beeb6075626 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Thu, 26 May 2011 10:34:48 +0200
Subject: [PATCH] fix search paths when building python bindings

The code is searching for it's own libs+includes only in /usr/local,
instead of just taking the variants it provides itself. This also does
not work if we cross compile or build distributions, with DESTDIR != /.

Forwarded: no
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
---
 wrapper/python/Makefile | 2 +-
 wrapper/python/setup.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wrapper/python/Makefile b/wrapper/python/Makefile
index 22435a4..4f4d9d2 100755
--- a/wrapper/python/Makefile
+++ b/wrapper/python/Makefile
@@ -2,7 +2,7 @@ all:
 	python setup.py build
 
 install:
-	python setup.py install
+	python setup.py install --prefix=$$DESTDIR/usr
 
 clean:
 	rm -Rf build
diff --git a/wrapper/python/setup.py b/wrapper/python/setup.py
index 2cb10d4..7d9404b 100755
--- a/wrapper/python/setup.py
+++ b/wrapper/python/setup.py
@@ -22,8 +22,8 @@
 from distutils.core import setup, Extension
 
 mod = Extension( '_pydmtx',
-                 include_dirs = ['/usr/local/include'],
-                 library_dirs = ['/usr/local/lib'],
+                 include_dirs = ['../../'],
+                 library_dirs = ['../../.libs'],
                  libraries = ['dmtx'],
                  sources = ['pydmtxmodule.c'] )