pkg-config: Don't generate and install pkg-config with relative paths

Don't put relative paths in pkg-config files, including uninstalled
ones. For those, use @abs_topbuilddir@ and @abs_topsrcdir@ as we
do elsewhere.

Remove libraries= directives, which doesn't seem to be a pkg-config
variable that actually exists, but has been in all our pkg-config
files for as long as they've existed.
This commit is contained in:
Jan Schmidt 2016-01-29 04:50:42 +11:00 committed by Tim-Philipp Müller
parent e03e983e90
commit 2bef3f740e
2 changed files with 10 additions and 11 deletions

View file

@ -1,15 +1,14 @@
prefix= prefix=
exec_prefix= exec_prefix=
libdir=${pcfiledir}/../gst-libs/gst/gl libdir=
includedir=${pcfiledir}/../gst-libs includedir=@abs_top_builddir@/gst-libs
pluginsdir=${pcfiledir}/.. girdir=@abs_top_builddir@/gst-libs/gst/base
typelibdir=@abs_top_builddir@/gst-libs/gst/base
Name: GStreamer OpenGL Plugins Libraries, Uninstalled Name: GStreamer OpenGL Plugins Libraries, Uninstalled
Description: Streaming media framework, OpenGL plugins libraries, uninstalled Description: Streaming media framework, OpenGL plugins libraries, uninstalled
Version: @VERSION@ Version: @VERSION@
Requires: gstreamer-@GST_API_VERSION@ Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@
Libs: -L${libdir} ${libdir}/libgstgl-@GST_API_VERSION@.la @GL_LIBS@ Libs: @abs_top_builddir@/gst-libs/gst/gl/libgstgl-@GST_API_VERSION@.la
Cflags: -I${includedir} -I@srcdir@/.. @GL_CFLAGS@ Cflags: -I@abs_top_srcdir@/gst-libs -I@abs_top_builddir@/gst-libs
libraries=gl

View file

@ -6,8 +6,8 @@ pluginsdir=@libdir@/gstreamer-@GST_API_VERSION@
Name: GStreamer OpenGL Plugins Libraries Name: GStreamer OpenGL Plugins Libraries
Description: Streaming media framework, OpenGL plugins libraries Description: Streaming media framework, OpenGL plugins libraries
Requires: gstreamer-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@
Version: @VERSION@ Version: @VERSION@
Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ @GL_LIBS@ Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@
Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@
Libs: -L${libdir} -lgstgl-@GST_API_VERSION@ @GL_LIBS@
Cflags: -I${includedir} @GL_CFLAGS@