|
 |
f4a754 |
From 4953f89845a55bddd21df1b505301b884ab2809a Mon Sep 17 00:00:00 2001
|
|
|
f4a754 |
From: Colin Walters <walters@verbum.org>
|
|
|
f4a754 |
Date: Tue, 18 Mar 2014 16:04:23 -0400
|
|
|
f4a754 |
Subject: [PATCH] Move python modules to architecture-specific directory
|
|
|
f4a754 |
|
|
|
f4a754 |
This is because dbus-python gets dragged in as a dependency of other
|
|
|
f4a754 |
things people want to be multilib-compatible. As is the Python
|
|
|
f4a754 |
modules conflict.
|
|
|
f4a754 |
---
|
|
|
f4a754 |
Makefile.am | 9 +++++----
|
|
|
f4a754 |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
f4a754 |
|
|
|
f4a754 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
f4a754 |
index ebc2e43..1a14da4 100644
|
|
|
f4a754 |
--- a/Makefile.am
|
|
|
f4a754 |
+++ b/Makefile.am
|
|
|
f4a754 |
@@ -17,7 +17,8 @@ EXTRA_DIST = \
|
|
|
f4a754 |
|
|
|
f4a754 |
# === dbus package ===
|
|
|
f4a754 |
|
|
|
f4a754 |
-nobase_python_PYTHON = \
|
|
|
f4a754 |
+dbuspydir = $(pyexecdir)
|
|
|
f4a754 |
+nobase_dbuspy_DATA = \
|
|
|
f4a754 |
dbus/bus.py \
|
|
|
f4a754 |
dbus/connection.py \
|
|
|
f4a754 |
dbus/_compat.py \
|
|
|
f4a754 |
@@ -38,12 +39,12 @@ nobase_python_PYTHON = \
|
|
|
f4a754 |
dbus/types.py
|
|
|
f4a754 |
|
|
|
f4a754 |
if !HAVE_PYTHON_3
|
|
|
f4a754 |
-nobase_python_PYTHON += \
|
|
|
f4a754 |
+nobase_dbuspy_DATA += \
|
|
|
f4a754 |
dbus/gobject_service.py \
|
|
|
f4a754 |
$(NULL)
|
|
|
f4a754 |
endif
|
|
|
f4a754 |
|
|
|
f4a754 |
-check_py_sources = $(nobase_python_PYTHON)
|
|
|
f4a754 |
+check_py_sources = $(nobase_dbuspy_DATA)
|
|
|
f4a754 |
include $(top_srcdir)/tools/check-coding-style.mk
|
|
|
f4a754 |
|
|
|
f4a754 |
# === Devel stuff ===
|
|
|
f4a754 |
@@ -130,7 +131,7 @@ _dbus_glib_bindings/_dbus_glib_bindings.la:
|
|
|
f4a754 |
|
|
|
f4a754 |
APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs
|
|
|
f4a754 |
|
|
|
f4a754 |
-api api/index.html: $(nobase_python_PYTHON) \
|
|
|
f4a754 |
+api api/index.html: $(nobase_dbuspy_DATA) \
|
|
|
f4a754 |
_dbus_bindings/_dbus_bindings.la \
|
|
|
f4a754 |
_dbus_glib_bindings/_dbus_glib_bindings.la
|
|
|
f4a754 |
rm -rf api
|
|
|
f4a754 |
--
|
|
|
f4a754 |
1.8.3.1
|
|
|
f4a754 |
|