From 92b3b26d6ee76d0d4b488e9e57d3b3424d2649fb Mon Sep 17 00:00:00 2001 From: David Schleef Date: Thu, 18 Dec 2003 09:51:22 +0000 Subject: Merge HEAD from CAPS-ROOT to CAPS-MERGE-3, plus some caps conversion Original commit message from CVS: Merge HEAD from CAPS-ROOT to CAPS-MERGE-3, plus some caps conversion --- pkgconfig/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgconfig') diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am index 808545ae..36bca352 100644 --- a/pkgconfig/Makefile.am +++ b/pkgconfig/Makefile.am @@ -27,12 +27,12 @@ $(pcfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc ### how to generate gconf dir pc files from their pc.in files ### somebody smart could figure out how to fold this back into one rule -$(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf*.pc: - cd $(srcdir)/../gst-libs/gst/gconf && make gstreamer-gconf.pc gstreamer-gconf-uninstalled.pc +$(top_builddir)/gst-libs/gst/gconf/gstreamer-gconf*.pc: + cd $(top_builddir)/gst-libs/gst/gconf && make gstreamer-gconf.pc gstreamer-gconf-uninstalled.pc ### how to generate pc files from base .pc file in other dir $(pcfiles_gconf): gstreamer-gconf-@GST_MAJORMINOR@%.pc: \ - $(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf%.pc + $(top_builddir)/gst-libs/gst/gconf/gstreamer-gconf%.pc cp $< $@ pkgconfigdir = $(libdir)/pkgconfig -- cgit v1.2.1