summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-25 11:43:13 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-25 11:43:13 +0100
commit35ea12eeea50030d798787a44d20f1363849fa8e (patch)
treed96c499df4d105d234cff6f4f30075642c6b4b75 /scripts
parent8d21d0c95d7f1acf2ea8769a2d3853aeb783d596 (diff)
parente1dbab9bea550f4f61c792ed92acc3bd687d43d7 (diff)
Merge branch 'master' into 0.11
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/gst-uninstalled6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/gst-uninstalled b/scripts/gst-uninstalled
index fa51658b7c..6cc1b37169 100755
--- a/scripts/gst-uninstalled
+++ b/scripts/gst-uninstalled
@@ -59,10 +59,12 @@ $PATH"
# /some/path: makes the dynamic linker look in . too, so avoid this
LD_LIBRARY_PATH=$GST_PREFIX/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
DYLD_LIBRARY_PATH=$GST_PREFIX/lib${DYLD_LIBRARY_PATH:+:$DYLD_LIBRARY_PATH}
+GI_TYPELIB_PATH=$GST_PREFIX/share/gir-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}
# GStreamer rtsp server library
LD_LIBRARY_PATH=$GST/gst-rtsp-server/gst/rtsp-server/.libs:$LD_LIBRARY_PATH
DYLD_LIBRARY_PATH=$GST/gst-rtsp-server/gst/rtsp-server/.libs:$DYLD_LIBRARY_PATH
+GI_TYPELIB_PATH=$GST/gst-rtsp-server/gst/rtsp-server:$GI_TYPELIB_PATH
# GStreamer ffmpeg libraries
for path in libavformat libavutil libavcodec libpostproc libavdevice
@@ -76,6 +78,7 @@ for path in app audio cdda fft interfaces pbutils netbuffer riff rtp rtsp sdp ta
do
LD_LIBRARY_PATH=$GST/gst-plugins-base/gst-libs/gst/$path/.libs:$LD_LIBRARY_PATH
DYLD_LIBRARY_PATH=$GST/gst-plugins-base/gst-libs/gst/$path/.libs:$DYLD_LIBRARY_PATH
+ GI_TYPELIB_PATH=$GST/gst-plugins-base/gst-libs/gst/$path:$GI_TYPELIB_PATH
done
# GStreamer core libraries
@@ -83,11 +86,14 @@ for path in base net check controller
do
LD_LIBRARY_PATH=$GST/gstreamer/libs/gst/$path/.libs:$LD_LIBRARY_PATH
DYLD_LIBRARY_PATH=$GST/gstreamer/libs/gst/$path/.libs:$DYLD_LIBRARY_PATH
+ GI_TYPELIB_PATH=$GST/gstreamer/libs/gst/$path:$GI_TYPELIB_PATH
done
LD_LIBRARY_PATH=$GST/gstreamer/gst/.libs:$LD_LIBRARY_PATH
DYLD_LIBRARY_PATH=$GST/gstreamer/gst/.libs:$DYLD_LIBRARY_PATH
+GI_TYPELIB_PATH=$GST/gstreamer/gst:$GI_TYPELIB_PATH
export LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH
+export GI_TYPELIB_PATH
export PKG_CONFIG_PATH="\
$GST_PREFIX/lib/pkgconfig\