aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris J Arges <arges@macgyver>2013-01-21 18:18:27 +0000
committerTarmac <Unknown>2013-01-21 18:18:27 +0000
commitee33a9adfc9c657c3be11a8bcaf25e687fdde026 (patch)
tree058228825ce34f423379c342c6ebf54d883890a7
parent3050e349a4d759d11efbeefe040589abfca5c2e2 (diff)
parent962ea761d61649b8b19a05d788749fdb03aa3c61 (diff)
downloadlibayatana-appindicator-ee33a9adfc9c657c3be11a8bcaf25e687fdde026.tar.gz
libayatana-appindicator-ee33a9adfc9c657c3be11a8bcaf25e687fdde026.tar.bz2
libayatana-appindicator-ee33a9adfc9c657c3be11a8bcaf25e687fdde026.zip
This fixes python multi-arch include issues.
This changes fixes a FTBFS issue found during an archive rebuild: http://people.ubuntuwire.org/~wgrant/rebuild-ftbfs-test/test-rebuild-20121221-raring.html. Approved by Mathieu Trudel-Lapierre.
-rw-r--r--acinclude.m42
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 3e98bd3..8c75106 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -230,7 +230,7 @@ AC_MSG_CHECKING(for headers required to compile python extensions)
dnl deduce PYTHON_INCLUDES
py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
-PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+PYTHON_INCLUDES="`$PYTHON-config --includes`"
if test "$py_prefix" != "$py_exec_prefix"; then
PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
fi
diff --git a/debian/changelog b/debian/changelog
index 7643608..b6890b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libappindicator (12.10.1-0ubuntu2) UNRELEASED; urgency=low
+
+ * acinclude.m4: Fix python multi-arch include issues.
+
+ -- Chris J Arges <chris.j.arges@canonical.com> Thu, 17 Jan 2013 15:25:28 -0600
+
libappindicator (12.10.1-0ubuntu1) UNRELEASED; urgency=low
* debian/control: