changeset
merge of '9e7955ab265f0ea741334a16e55db6a79f51f313'
Wed, 24 Jan 2007 22:12:17 +0000
- author
- Ethan Blanton <elb@pidgin.im>
- date
- Wed, 24 Jan 2007 22:12:17 +0000
- changeset 15470
- d2ccd98e5c77
- parent 15469
- 9e7955ab265f (current diff)
- parent 15468
- eba565166be9 (diff)
- child 15471
- ed25e8510145
- child 15472
- f9fbebc103ff
merge of '9e7955ab265f0ea741334a16e55db6a79f51f313'
and 'eba565166be9a2342d020b7c4afeb29b426b0460'
--- 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 );
--- 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
