From 7c613ec3476dc0a5b0411dc76f9704eb942cb22b Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Wed, 4 Jan 2017 17:40:59 +0100 Subject: [PATCH] meson: generate pkg-config -uninstalled pc files Generating those files is useful for users building the GStreamer stack using meson and having to link it to another project which is still using the autotools. Fixed the -uninstalled pc file libdir path while I was on it. https://bugzilla.gnome.org/show_bug.cgi?id=776810 --- validate/pkgconfig/Makefile.am | 7 ++++++- validate/pkgconfig/gst-validate-uninstalled.pc.in | 2 +- validate/pkgconfig/meson.build | 9 +++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/validate/pkgconfig/Makefile.am b/validate/pkgconfig/Makefile.am index b93b5c9623..4746a0407e 100644 --- a/validate/pkgconfig/Makefile.am +++ b/validate/pkgconfig/Makefile.am @@ -10,7 +10,12 @@ all-local: $(pcfiles) $(pcfiles_uninstalled) %-@GST_API_VERSION@.pc: %.pc cp $< $@ %-@GST_API_VERSION@-uninstalled.pc: %-uninstalled.pc - cp $< $@ +### the uninstalled libdir is depend of the build system used so set it here +### rather than hardcoding it in the file directly. + $(AM_V_GEN) sed \ + -e "s|[@]validatelibdir[@]|$(abs_top_builddir)/gst/validate/.libs|" \ + $< > $@.tmp && mv $@.tmp $@ + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(pcfiles) diff --git a/validate/pkgconfig/gst-validate-uninstalled.pc.in b/validate/pkgconfig/gst-validate-uninstalled.pc.in index 7f77d226a2..6f2d83349e 100644 --- a/validate/pkgconfig/gst-validate-uninstalled.pc.in +++ b/validate/pkgconfig/gst-validate-uninstalled.pc.in @@ -1,7 +1,7 @@ # the standard variables don't make sense for an uninstalled copy prefix= exec_prefix= -libdir=@abs_top_builddir@/ges +libdir=@validatelibdir@ includedir=@abs_top_builddir@ Name: gst-validate diff --git a/validate/pkgconfig/meson.build b/validate/pkgconfig/meson.build index 5105417a3c..5cbbe7e5fe 100644 --- a/validate/pkgconfig/meson.build +++ b/validate/pkgconfig/meson.build @@ -7,9 +7,18 @@ pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) pkgconf.set('GST_API_VERSION', apiversion) pkgconf.set('VERSION', gst_version) +# needed for generating -uninstalled.pc files +pkgconf.set('abs_top_builddir', join_paths(meson.current_build_dir(), '..')) +pkgconf.set('abs_top_srcdir', join_paths(meson.current_source_dir(), '..')) +pkgconf.set('validatelibdir', join_paths(meson.build_root(), gstvalidate.outdir())) + pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir')) configure_file(input : 'gst-validate.pc.in', output : 'gst-validate-1.0.pc', configuration : pkgconf, install_dir : pkg_install_dir) + +configure_file(input : 'gst-validate-uninstalled.pc.in', + output : 'gst-validate-1.0-uninstalled.pc', + configuration : pkgconf)