mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 03:35:21 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename DATADIR to GST_DATADIR to avoid build problems

Browse source 
Original commit message from CVS:
* configure.ac:
* gst/gstpreset.c:
Rename DATADIR to GST_DATADIR to avoid build problems
on win32. Patch By: David Schleef <ds@schleef.org>
Fixes: #536857
This commit is contained in:
David Schleef 2008-06-11 20:07:31 +00:00 committed by Jan Schmidt
parent 9e6cce35a0
commit eaeb1a3434
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2008-06-11 Jan Schmidt <jan.schmidt@sun.com>
* configure.ac:
* gst/gstpreset.c:
Rename DATADIR to GST_DATADIR to avoid build problems
on win32. Patch By: David Schleef <ds@schleef.org>
Fixes: #536857
2008-06-05 Sebastian Dröge <slomo@circular-chaos.org>
* configure.ac:

2
common

@ -1 +1 @@
Subproject commit 68fb019d4044b9878aef4ca223fc13c19ffc7d0c
Subproject commit 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8

4
configure.ac
View file

@ -524,11 +524,11 @@ GST_LICENSE="LGPL"
AC_DEFINE_UNQUOTED(GST_LICENSE, "$GST_LICENSE", [GStreamer license])
AC_SUBST(GST_LICENSE)
dnl define LIBDIR, DATADIR so we can inform people where we live
dnl define LIBDIR, GST_DATADIR so we can inform people where we live
AS_AC_EXPAND(LIBDIR, $libdir)
AC_DEFINE_UNQUOTED(LIBDIR, "$LIBDIR", [library dir])
AS_AC_EXPAND(DATADIR, $datadir)
AC_DEFINE_UNQUOTED(DATADIR, "$DATADIR", [data dir])
AC_DEFINE_UNQUOTED(GST_DATADIR, "$DATADIR", [data dir])
dnl set location of plugin directory
AG_GST_SET_PLUGINDIR

4
gst/gstpreset.c
View file

@ -149,8 +149,8 @@ preset_get_paths (GstPreset * preset, const gchar ** preset_user_path,
if (!(preset_path = g_type_get_qdata (type, preset_system_path_quark))) {
gchar *preset_dir;
/* system presets in '$DATADIR/gstreamer-0.10/presets/GstAudioPanorama.prs' */
preset_dir = g_build_filename (DATADIR, "gstreamer-" GST_MAJORMINOR,
/* system presets in '$GST_DATADIR/gstreamer-0.10/presets/GstAudioPanorama.prs' */
preset_dir = g_build_filename (GST_DATADIR, "gstreamer-" GST_MAJORMINOR,
"presets", NULL);
GST_INFO_OBJECT (preset, "system_preset_dir: '%s'", preset_dir);
preset_path = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "%s.prs",