/pidgin/main: 526382eb34de: Merge release-2.x.y

[Tomasz Wasilczyk]

Changeset: 526382eb34debb9256736e55ba30d43aae92b76b
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-02-24 18:15 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/526382eb34de

Description:

Merge release-2.x.y

diffstat:

 libpurple/plugins/perl/Makefile.am |  1 +
 pidgin/plugins/perl/Makefile.am    |  1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

diffs (22 lines):

diff --git a/libpurple/plugins/perl/Makefile.am b/libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am
+++ b/libpurple/plugins/perl/Makefile.am
@@ -137,6 +137,7 @@ clean-generic:
 		$(MAKE) clean; \
 		cd ..; \
 	done
+	cd common ; rm -rf *.c *.o pm_to_blib Purple.bs MYMETA.* blib/*/.exists blib/*/auto/Purple blib/*/Purple.*pm ; cd ..
 	rm -f *.so
 
 distclean-generic:
diff --git a/pidgin/plugins/perl/Makefile.am b/pidgin/plugins/perl/Makefile.am
--- a/pidgin/plugins/perl/Makefile.am
+++ b/pidgin/plugins/perl/Makefile.am
@@ -80,6 +80,7 @@ clean-generic:
 		$(MAKE) clean; \
 		cd ..; \
 	done
+	cd common ; rm -rf *.c *.o pm_to_blib Pidgin.bs MYMETA.* blib/*/.exists blib/*/auto/Pidgin blib/*/Pidgin.*pm ; cd ..
 	rm -f *.so
 
 distclean-generic: