diff options
| author | Stefano Karapetsas <[email protected]> | 2013-12-31 08:19:27 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-12-31 08:19:27 -0800 |
| commit | dfc74c8749852e4054d3c784f9adbec3de310a79 (patch) | |
| tree | 6d812f8cc448394352e1a509475d6f022e3d2919 /configure.ac | |
| parent | b7a57e21e92add2087d0b6ee5f4d93e2b3b468cd (diff) | |
| parent | 92b8ddf6a4b42d818b5ba2095e2d8f084f777170 (diff) | |
| download | pluma-dfc74c8749852e4054d3c784f9adbec3de310a79.tar.bz2 pluma-dfc74c8749852e4054d3c784f9adbec3de310a79.tar.xz | |
Merge pull request #51 from infirit/1.6
Cherrypick usefull commits from master
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index e9cecfad..c236de83 100644 --- a/configure.ac +++ b/configure.ac @@ -370,9 +370,9 @@ if test "x$have_python" != "xno"; then PYTHON_EXTRA_LIBS= else PY_PREFIX=`$PYTHON -c 'import sys ; print sys.prefix'` - PYTHON_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config" + PYTHON_LIB_LOC="-L$libdir/python$PYTHON_VERSION/config" PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION" - PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile" + PYTHON_MAKEFILE="$libdir/python$PYTHON_VERSION/config/Makefile" PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE` PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS" @@ -588,7 +588,7 @@ it from: http://pub.mate-desktop.org/release/1.${stable_version}/ -Or checkout the mate-${stable_version} branch of the pluma module from: +Or checkout the 1.${stable_version} branch of the pluma module from: git://github.com/mate-desktop/mate-text-editor.git |