changeset 21460:f3225e454f8d

merge of '9a0d3011817c44b114c37789a6561df8c8d75a80' and 'fb7fda6b05cb7561280e5735d220925f3fb55bfb'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 12 Nov 2007 19:04:01 +0000
parents 389a51db740f (diff) 675fbb9a402e (current diff)
children a34204321321
files
diffstat 5 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/finch/finch.pc.in	Mon Nov 12 18:59:14 2007 +0000
+++ b/finch/finch.pc.in	Mon Nov 12 19:04:01 2007 +0000
@@ -2,8 +2,8 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datarootdir=@datarootdir@
 datadir=@datadir@
-datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: Finch
--- a/libpurple/purple-uninstalled.pc.in	Mon Nov 12 18:59:14 2007 +0000
+++ b/libpurple/purple-uninstalled.pc.in	Mon Nov 12 19:04:01 2007 +0000
@@ -2,8 +2,8 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datarootdir=@datarootdir@
 datadir=@datadir@
-datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: libpurple
--- a/libpurple/purple.pc.in	Mon Nov 12 18:59:14 2007 +0000
+++ b/libpurple/purple.pc.in	Mon Nov 12 19:04:01 2007 +0000
@@ -2,8 +2,8 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datarootdir=@datarootdir@
 datadir=@datadir@
-datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: libpurple
--- a/pidgin/pidgin-uninstalled.pc.in	Mon Nov 12 18:59:14 2007 +0000
+++ b/pidgin/pidgin-uninstalled.pc.in	Mon Nov 12 19:04:01 2007 +0000
@@ -2,8 +2,8 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datarootdir=@datarootdir@
 datadir=@datadir@
-datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: Pidgin
--- a/pidgin/pidgin.pc.in	Mon Nov 12 18:59:14 2007 +0000
+++ b/pidgin/pidgin.pc.in	Mon Nov 12 19:04:01 2007 +0000
@@ -2,8 +2,8 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
+datarootdir=@datarootdir@
 datadir=@datadir@
-datarootdir=@datarootdir@
 sysconfdir=@sysconfdir@
 
 Name: Pidgin