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