install in pyexecdir as well

Original commit message from CVS:

* configure.ac:
* gst/Makefile.am:
* gst/extend/Makefile.am:
install in pyexecdir as well

diff --git a/ChangeLog b/ChangeLog
index ad0fe5a..7ff19ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-12-22  Thomas Vander Stichele  <thomas at apestaart dot org>
 
+       * configure.ac:
+       * gst/Makefile.am:
+       * gst/extend/Makefile.am:
+         install in pyexecdir as well
+
+2005-12-22  Thomas Vander Stichele  <thomas at apestaart dot org>
+
        * pygst.py.in: give the correct error when not finding the version
 
 2005-12-20  Edward Hervey  <edward@fluendo.com>

diff --git a/configure.ac b/configure.ac
index 7ac104a..febcf28 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
 AM_MAINTAINER_MODE
                                                                                 
 dnl when going to/from release please set the nano (fourth number) right !
-AS_VERSION(gst-python, PYGST_VERSION, 0, 10, 0, 2,
+AS_VERSION(gst-python, PYGST_VERSION, 0, 10, 0, 3,
     GST_CVS="no", GST_CVS="yes")
 
 AM_INIT_AUTOMAKE($PACKAGE, $VERSION)

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 14b05c5..524e82b 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -2,10 +2,11 @@ common_cflags = $(PYGTK_CFLAGS) $(GST_CFLAGS) $(PYGST_CFLAGS) -fno-strict-aliasi
 common_libadd = $(GST_LIBS)
 common_ldflags = -module -avoid-version
 
-pkgpythondir = $(pythondir)/gst-$(GST_MAJORMINOR)/gst
 pkgpyexecdir = $(pyexecdir)/gst-$(GST_MAJORMINOR)/gst
 
-pygstdir = $(pkgpythondir)
+# we install everything in pyexecdir; otherwise you end up with a mess for
+# multilib
+pygstdir = $(pkgpyexecdir)
 pygst_PYTHON = __init__.py
 
 pygstexecdir = $(pkgpyexecdir)

diff --git a/gst/extend/Makefile.am b/gst/extend/Makefile.am
index f04208b..37fec06 100644 (file)
--- a/gst/extend/Makefile.am
+++ b/gst/extend/Makefile.am
@@ -1,4 +1,4 @@
-pkgpythondir = $(pythondir)/gst-$(GST_MAJORMINOR)/gst/extend
+pkgpyexecdir = $(pyexecdir)/gst-$(GST_MAJORMINOR)/gst/extend
 
-pygstdir = $(pkgpythondir)
+pygstdir = $(pkgpyexecdir)
 pygst_PYTHON = __init__.py pygobject.py utils.py discoverer.py