changeset 21327:48c6c89a8158

merge of '0d945ca4ad9da6d9547272ea91c99f3dc3909ac6' and '521a02708a29c2d4c933477bab544075f089526f'
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 11 Nov 2007 16:56:03 +0000
parents 93e9e022a470 (current diff) 97dc2a474513 (diff)
children 6e23ec8b1634 be50064a83e0
files libpurple/protocols/gg/gg.c
diffstat 5 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/finch/finch.pc.in	Sun Nov 11 16:51:19 2007 +0000
+++ b/finch/finch.pc.in	Sun Nov 11 16:56:03 2007 +0000
@@ -3,6 +3,7 @@
 libdir=@libdir@
 includedir=@includedir@
 datadir=@datadir@
+datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: Finch
--- a/libpurple/purple-uninstalled.pc.in	Sun Nov 11 16:51:19 2007 +0000
+++ b/libpurple/purple-uninstalled.pc.in	Sun Nov 11 16:56:03 2007 +0000
@@ -3,6 +3,7 @@
 libdir=@libdir@
 includedir=@includedir@
 datadir=@datadir@
+datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: libpurple
--- a/libpurple/purple.pc.in	Sun Nov 11 16:51:19 2007 +0000
+++ b/libpurple/purple.pc.in	Sun Nov 11 16:56:03 2007 +0000
@@ -3,8 +3,9 @@
 libdir=@libdir@
 includedir=@includedir@
 datadir=@datadir@
+datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
- 
+
 Name: libpurple
 Description: libpurple is a GLib-based instant messenger library.
 Version: @VERSION@
--- a/pidgin/pidgin-uninstalled.pc.in	Sun Nov 11 16:51:19 2007 +0000
+++ b/pidgin/pidgin-uninstalled.pc.in	Sun Nov 11 16:56:03 2007 +0000
@@ -3,6 +3,7 @@
 libdir=@libdir@
 includedir=@includedir@
 datadir=@datadir@
+datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: Pidgin
--- a/pidgin/pidgin.pc.in	Sun Nov 11 16:51:19 2007 +0000
+++ b/pidgin/pidgin.pc.in	Sun Nov 11 16:56:03 2007 +0000
@@ -3,6 +3,7 @@
 libdir=@libdir@
 includedir=@includedir@
 datadir=@datadir@
+datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: Pidgin