pidgin: fc93e0ea: Fix -uninstalled pc files for out-of-tre...

resiak at pidgin.im resiak at pidgin.im
Sun Dec 20 13:05:50 EST 2009


-----------------------------------------------------------------
Revision: fc93e0ea1ceae4b0e76c50e35965814711dc1c00
Ancestor: 03d1409613057bd402e5659d936f59a6d201a93e
Author: resiak at pidgin.im
Date: 2009-12-20T17:13:47
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fc93e0ea1ceae4b0e76c50e35965814711dc1c00

Modified files:
        libpurple/purple-uninstalled.pc.in
        pidgin/pidgin-uninstalled.pc.in

ChangeLog: 

Fix -uninstalled pc files for out-of-tree builds.

${pcfiledir} expands to the directory that the .pc file is in. This isn't right
for out-of-tree builds: we want to add the source directory to the include
path.

In the case of libpurple, we need both because some of the headers are
generated.

-------------- next part --------------
============================================================
--- libpurple/purple-uninstalled.pc.in	e17c7467aea71dd1e16ab06239da5d66868478f3
+++ libpurple/purple-uninstalled.pc.in	81ad0d06feafe5f2f05a75f9a188bb74a3ed91ff
@@ -6,9 +6,12 @@ sysconfdir=@sysconfdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
 Name: libpurple
 Description: libpurple is a GLib-based instant messenger library.
 Version: @VERSION@
 Requires: glib-2.0
-Cflags: -I${pcfiledir}
-Libs: ${pcfiledir}/libpurple.la
+Cflags: -I${abs_srcdir} -I${abs_builddir}
+Libs: ${abs_builddir}/libpurple.la
============================================================
--- pidgin/pidgin-uninstalled.pc.in	cabcaa661e6512053e96ff570676d018f7901fea
+++ pidgin/pidgin-uninstalled.pc.in	2b4049a683b1df718a9e049d713f159772894c5d
@@ -6,8 +6,11 @@ sysconfdir=@sysconfdir@
 datadir=@datadir@
 sysconfdir=@sysconfdir@
 
+abs_srcdir=@abs_srcdir@
+abs_builddir=@abs_builddir@
+
 Name: Pidgin
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
 Requires: gtk+-2.0 purple
-Cflags: -I${pcfiledir}
+Cflags: -I${abs_srcdir}


More information about the Commits mailing list