summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2013-06-03 18:28:43 +0100
committerSimon McVittie <smcv@debian.org>2013-06-03 18:28:43 +0100
commit16e13c75da71b155dd44eab69fe297c5030a0190 (patch)
treeb28c69914c1478fa6322f89f5c527234b4e58b38
parente3e598b633246d1e956fd8b7c3e1bfdf381107fb (diff)
Force pythondir/pyexecdir instead of taking the default, fixing FTBFS
Automake 1.12.6 changed the default installation directory.
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/rules12
2 files changed, 15 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 911c34d..8de14f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ dbus-python (1.2.0-2) UNRELEASED; urgency=low
* Canonicalize Vcs-Git
* Standards-Version: 3.9.4 (no further changes)
+ * Automake 1.12.6 changed the default installation directory.
+ Force pythondir/pyexecdir instead of taking the default, fixing FTBFS
+ (Closes: #710926)
-- Simon McVittie <smcv@debian.org> Mon, 03 Jun 2013 17:41:57 +0100
diff --git a/debian/rules b/debian/rules
index d245aec..c1bbd36 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,12 +53,18 @@ override_dh_auto_install-arch:
--arch \
--builddirectory=build-$$x \
--destdir=debian/tmp \
+ -- \
+ pyexecdir='$${pythondir}' \
+ pythondir='$${libdir}'/python$$x/dist-packages \
; \
PYTHON=/usr/bin/python$$x-dbg \
dh_auto_install \
--arch \
--builddirectory=build-$$x-dbg \
--destdir=debian/tmp-dbg \
+ -- \
+ pyexecdir='$${pythondir}' \
+ pythondir='$${libdir}'/python$$x/dist-packages \
; \
install debian/tmp-dbg/usr/lib/python$$x/dist-packages/_dbus_bindings.so \
debian/tmp/usr/lib/python$$x/dist-packages/_dbus_bindings_d.so; \
@@ -71,6 +77,9 @@ override_dh_auto_install-arch:
--arch \
--builddirectory=build-$$x \
--destdir=debian/tmp \
+ -- \
+ pyexecdir='$${pythondir}' \
+ pythondir='$${libdir}/python3/dist-packages' \
; \
so=`/usr/bin/python$$x -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))"`; \
mv debian/tmp/usr/lib/python3/dist-packages/_dbus_bindings.so \
@@ -82,6 +91,9 @@ override_dh_auto_install-arch:
--arch \
--builddirectory=build-$$x-dbg \
--destdir=debian/tmp-dbg \
+ -- \
+ pyexecdir='$${pythondir}' \
+ pythondir='$${libdir}/python3/dist-packages' \
; \
so=`/usr/bin/python$$x-dbg -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))"`; \
mv debian/tmp-dbg/usr/lib/python3/dist-packages/_dbus_bindings.so \