Commit 05461e57 authored by Colin Walters's avatar Colin Walters

codegen: Install Python files in $(datadir)/glib-2.0, rather than $(libdir)

These files are actually architecture-indepdendent; using $(libdir)
for them means that /usr/bin/gdbus-codegen varies between
architectures, which is problematic for (mis)uses of multilib.

See https://bugzilla.redhat.com/show_bug.cgi?id=718404

https://bugzilla.gnome.org/show_bug.cgi?id=685012
parent ce069874
......@@ -5,7 +5,7 @@ bin_SCRIPTS =
CLEANFILES =
EXTRA_DIST =
codegendir = $(libdir)/gdbus-2.0/codegen
codegendir = $(datadir)/glib-2.0/codegen
codegen_PYTHON = \
__init__.py \
codegen.py \
......@@ -24,7 +24,7 @@ CLEANFILES += gdbus-codegen
EXTRA_DIST += gdbus-codegen.in
gdbus-codegen: gdbus-codegen.in Makefile $(codegen_PYTHON)
$(AM_V_GEN) sed -e 's,@libdir\@,$(libdir),' -e 's,@PYTHON\@,$(PYTHON),' $< > $@.tmp && mv $@.tmp $@
$(AM_V_GEN) sed -e 's,@datadir\@,$(datadir),' -e 's,@PYTHON\@,$(PYTHON),' $< > $@.tmp && mv $@.tmp $@
@chmod a+x $@
clean-local:
......
......@@ -33,7 +33,7 @@ elif os.name == 'nt':
# Makes gdbus-codegen 'relocatable' at runtime on Windows.
path = os.path.join(os.path.dirname(__file__), '..', 'lib', 'gdbus-2.0')
else:
path = os.path.join('@libdir@', 'gdbus-2.0')
path = os.path.join('@datadir@', 'glib-2.0')
sys.path.insert(0, os.path.abspath(path))
from codegen import codegen_main
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment