|
 |
554d12 |
From 380ae714f641a73a30f86ae8f5a2e05ac063b37f Mon Sep 17 00:00:00 2001
|
|
|
554d12 |
From: leigh123linux <leigh123linux@googlemail.com>
|
|
|
554d12 |
Date: Tue, 23 Feb 2016 07:32:08 +0000
|
|
|
554d12 |
Subject: [PATCH] Move python modules to architecture-specific directory
|
|
|
554d12 |
|
|
|
554d12 |
This is because dbus-python gets dragged in as a dependency of other
|
|
|
554d12 |
things people want to be multilib-compatible. As is the Python
|
|
|
554d12 |
modules conflict.
|
|
|
554d12 |
---
|
|
|
554d12 |
Makefile.am | 9 +++++----
|
|
|
554d12 |
1 file changed, 5 insertions(+), 4 deletions(-)
|
|
|
554d12 |
|
|
|
554d12 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
554d12 |
index 3a821fa..dcf4320 100644
|
|
|
554d12 |
--- a/Makefile.am
|
|
|
554d12 |
+++ b/Makefile.am
|
|
|
554d12 |
@@ -146,7 +146,8 @@ dbus_py_test_la_SOURCES = \
|
|
|
554d12 |
|
|
|
554d12 |
# === dbus package ===
|
|
|
554d12 |
|
|
|
554d12 |
-nobase_python_PYTHON = \
|
|
|
554d12 |
+dbuspydir = $(pyexecdir)
|
|
|
554d12 |
+nobase_dbuspy_DATA = \
|
|
|
554d12 |
dbus/bus.py \
|
|
|
554d12 |
dbus/connection.py \
|
|
|
554d12 |
dbus/_compat.py \
|
|
|
554d12 |
@@ -167,12 +168,12 @@ nobase_python_PYTHON = \
|
|
|
554d12 |
dbus/types.py
|
|
|
554d12 |
|
|
|
554d12 |
if !HAVE_PYTHON_3
|
|
|
554d12 |
-nobase_python_PYTHON += \
|
|
|
554d12 |
+nobase_dbuspy_DATA += \
|
|
|
554d12 |
dbus/gobject_service.py \
|
|
|
554d12 |
$(NULL)
|
|
|
554d12 |
endif
|
|
|
554d12 |
|
|
|
554d12 |
-check_py_sources = $(nobase_python_PYTHON)
|
|
|
554d12 |
+check_py_sources = $(nobase_dbuspy_DATA)
|
|
|
554d12 |
include $(top_srcdir)/tools/check-coding-style.mk
|
|
|
554d12 |
|
|
|
554d12 |
# === Devel stuff ===
|
|
|
554d12 |
@@ -415,7 +416,7 @@ clean-local:
|
|
|
554d12 |
|
|
|
554d12 |
APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/.libs
|
|
|
554d12 |
|
|
|
554d12 |
-api api/index.html: $(nobase_python_PYTHON) \
|
|
|
554d12 |
+api api/index.html: $(nobase_dbuspy_DATA) \
|
|
|
554d12 |
_dbus_bindings.la \
|
|
|
554d12 |
_dbus_glib_bindings.la
|
|
|
554d12 |
rm -rf api
|
|
|
554d12 |
--
|
|
|
554d12 |
2.5.0
|
|
|
554d12 |
|