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