tjh.dev
1diff --git a/configure.ac b/configure.ac
2index a3cdb2da..cade9466 100644
3--- a/configure.ac
4+++ b/configure.ac
5@@ -469,11 +469,11 @@ PKG_CHECK_EXISTS([pygobject-3.0 >= $PYGOBJECT_REQUIRED],
6 if test "x$enable_pygobject" = "xyes"; then
7 PKG_CHECK_MODULES(PYTHON, [pygobject-3.0 >= $PYGOBJECT_REQUIRED])
8
9- pyoverridesdir=`$PYTHON -c "import gi; print(gi._overridesdir)"`
10+ pyoverridesdir="$prefix/@pythonSitePackages@/gi/overrides"
11 AC_SUBST(pyoverridesdir)
12
13 if test x"$enable_python2" = x"yes"; then
14- py2overridesdir=`$PYTHON2 -c "import gi; print(gi._overridesdir)"`
15+ py2overridesdir="$prefix/@pythonSitePackages@/gi/overrides"
16 AC_SUBST(py2overridesdir)
17 fi
18 fi
19@@ -502,7 +502,7 @@ if test x"$enable_python_library" = x"yes"; then
20 PYTHON2_VERSION=`$PYTHON2 -c "import sys; sys.stdout.write(sys.version[[:3]])"`
21 PYTHON2_LIBDIR="$PYTHON2_PREFIX/lib/python$PYTHON2_VERSION"
22 python2dir="$PYTHON2_LIBDIR/site-packages"
23- pkgpython2dir="$python2dir/ibus"
24+ pkgpython2dir="$prefix/@pythonSitePackages@/ibus"
25 AC_SUBST(pkgpython2dir)
26 else
27 enable_python_library="no (disabled, use --enable-python-library to enable)"
28diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am
29index 5360f033..6d5e726f 100644
30--- a/data/dconf/Makefile.am
31+++ b/data/dconf/Makefile.am
32@@ -50,7 +50,7 @@ man_5dir = $(mandir)/man5
33
34 install-data-hook:
35 if test -z "$(DESTDIR)"; then \
36- dconf update; \
37+ true; \
38 fi
39
40 EXTRA_DIST = \
41diff --git a/setup/ibus-setup.in b/setup/ibus-setup.in
42index 474ce8a8..ee30808e 100644
43--- a/setup/ibus-setup.in
44+++ b/setup/ibus-setup.in
45@@ -27,5 +27,5 @@ export IBUS_PREFIX=@prefix@
46 export IBUS_DATAROOTDIR=@datarootdir@
47 export IBUS_LOCALEDIR=@localedir@
48 export IBUS_LIBEXECDIR=${libexecdir}
49-exec ${PYTHON:-@PYTHON@} @prefix@/share/ibus/setup/main.py "$@"
50+exec @pythonInterpreter@ @prefix@/share/ibus/setup/main.py "$@"
51