# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1169676737 0
# Node ID 91f384560c759940f6d82768b7f28938c6732c5e
# Parent  9d141139cc996a9781b9e14fd747ba08eac127b8# Parent  439a013d91bbf64fa92cf8b6c456c90398ff67bb
merge of 'd2a7c45e8f16efe8ed52a057ad51049809fffa3f'
     and 'ebf74db57222bc6667e3ca08dffa02539f5947a9'

diff -r 9d141139cc99 -r 91f384560c75 libpurple/plugins/perl/common/Makefile.PL.in
--- a/libpurple/plugins/perl/common/Makefile.PL.in	Wed Jan 24 22:06:40 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.PL.in	Wed Jan 24 22:12:17 2007 +0000
@@ -11,7 +11,7 @@
        AUTHOR     => 'Gaim <http://gaim.sourceforge.net/>') : ()),
     'LIBS'		=> [''], # e.g., '-lm'
     'DEFINE'		=> '@DEBUG_CFLAGS@', # e.g., '-DHAVE_SOMETHING'
-    'INC'		=> '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libgaim @GLIB_CFLAGS@', # e.g., '-I. -I/usr/include/other'
+    'INC'		=> '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple @GLIB_CFLAGS@', # e.g., '-I. -I/usr/include/other'
     'OBJECT'		=> '$(O_FILES)', # link all the C files too
 );
 
diff -r 9d141139cc99 -r 91f384560c75 pidgin/plugins/perl/common/Makefile.PL.in
--- a/pidgin/plugins/perl/common/Makefile.PL.in	Wed Jan 24 22:06:40 2007 +0000
+++ b/pidgin/plugins/perl/common/Makefile.PL.in	Wed Jan 24 22:12:17 2007 +0000
@@ -8,7 +8,7 @@
 	('ABSTRACT_FROM' => '@srcdir@/GtkUI.pm', # finds $ABSTRACT
 	'AUTHOR'        => 'Gaim <http://gaim.sourceforge.net/>') :  ()),
     'DEFINE'        => '@DEBUG_CFLAGS@',
-    'INC'           => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libgaim -I@top_srcdir@/gtk @GTK_CFLAGS@',
+    'INC'           => '-I. -I@srcdir@ -I@top_srcdir@ -I@top_srcdir@/libpurple -I@top_srcdir@/pidgin @GTK_CFLAGS@',
 #    'PREREQ_PM'     => { 'Gaim' => '@VERSION@'},
     # Do this because the MakeMaker Makefile is dumb, and on clean it moves
     # Makefile to the default setting for MAKEFILE_OLD which is Makefile.old