aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac7
-rw-r--r--python/pyempathy/Makefile.am2
-rw-r--r--python/pyempathygtk/Makefile.am2
4 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d7502fc5..fdb0c4d9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-08-24 Xavier Claessens <xclaesse@gmail.com>
+ * python/pyempathy/Makefile.am:
+ * python/pyempathygtk/Makefile.am:
+ * configure.ac: Make use of AM_PATH_PYTHON to get python variables.
+ Fixes bug #470642 (Daniel Gryniewicz).
+
+2007-08-24 Xavier Claessens <xclaesse@gmail.com>
+
* configure.ac: Bump version to 0.13.
* NEWS: Last NEWS entry is for version 0.12 and not 0.11.
diff --git a/configure.ac b/configure.ac
index 761b7f964..c31afd82c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,12 @@ if test "x$have_python" = "xno"; then
enable_python="no (missing dependencies)"
else
if test "x$enable_python" != "xno"; then
- enable_python="yes"
+ AM_PATH_PYTHON
+ if test -z "$PYTHON" ; then
+ enable_python="no"
+ else
+ enable_python="yes"
+ fi
else
enable_python="no (disabled)"
fi
diff --git a/python/pyempathy/Makefile.am b/python/pyempathy/Makefile.am
index 4778fdf20..c11eedbc3 100644
--- a/python/pyempathy/Makefile.am
+++ b/python/pyempathy/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS = \
BUILT_SOURCES = \
pyempathy.c
-pyempathydir = $(prefix)/lib/`pyversions -d`/site-packages
+pyempathydir = $(pyexecdir)
pyempathy_LTLIBRARIES = empathy.la
empathy_la_SOURCES = \
diff --git a/python/pyempathygtk/Makefile.am b/python/pyempathygtk/Makefile.am
index f7338654e..04aa5762f 100644
--- a/python/pyempathygtk/Makefile.am
+++ b/python/pyempathygtk/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
BUILT_SOURCES = \
pyempathygtk.c
-pyempathygtkdir = $(prefix)/lib/`pyversions -d`/site-packages
+pyempathygtkdir = $(pyexecdir)
pyempathygtk_LTLIBRARIES = empathygtk.la
empathygtk_la_SOURCES = \