diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2005-12-22 15:56:41 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2005-12-22 15:56:41 +0000 |
| commit | 915b66d2f188ae97d7139e4faf7d84da5a37efb9 (patch) | |
| tree | e1a4758b6c656375e29c2d5f2c83875cf8ed2253 | |
| parent | 2986e09cfef3776a83346cf58f479492b2f07f6c (diff) | |
install in pyexecdir as well
Original commit message from CVS:
* configure.ac:
* gst/Makefile.am:
* gst/extend/Makefile.am:
install in pyexecdir as well
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gst/Makefile.am | 5 | ||||
| -rw-r--r-- | gst/extend/Makefile.am | 4 |
4 files changed, 13 insertions, 5 deletions
@@ -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 7ac104abc7..febcf289e0 100644 --- 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 14b05c5362..524e82b598 100644 --- 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 f04208b863..37fec06f7d 100644 --- 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 |