summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2006-03-08 10:15:40 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2006-03-08 10:15:40 +0000
commit3df1770d8db38ab96458c88ec0570c40261ab39b (patch)
treeb55e193497d205681fe9f00c11e4f2afc15aa00b
parent3d1ecfb57e7c37bea8994551015277fb46d2a47f (diff)
gst/Makefile.am: commit pending patch to install correctly on 64 bit
Original commit message from CVS: * gst/Makefile.am: commit pending patch to install correctly on 64 bit
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--gst/Makefile.am4
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b744805a2d..24806e5b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-08 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * gst/Makefile.am:
+ commit pending patch to install correctly on 64 bit
+
2006-01-14 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
diff --git a/common b/common
-Subproject e0b121388ece524c0b7035a72bddd191d122d8b
+Subproject c09cd18d328f740ac532377fa5605b0f712cc6f
diff --git a/gst/Makefile.am b/gst/Makefile.am
index d51e72cab5..1d1f3c632c 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -2,10 +2,10 @@ common_cflags = $(PYGTK_CFLAGS) $(GST_CFLAGS) $(PYGST_CFLAGS) -fno-strict-aliasi
common_libadd = $(GST_LIBS)
common_ldflags = -module -avoid-version
-pkgpythondir = $(pythondir)/gst
pkgpyexecdir = $(pyexecdir)/gst
-pygstdir = $(pkgpythondir)
+# we also put this in pyexecdir so it works across multilib
+pygstdir = $(pkgpyexecdir)
pygst_PYTHON = __init__.py
pygstexecdir = $(pkgpyexecdir)