Merge release-2.x.y

Mon, 24 Feb 2014 18:15:13 +0100

author
Tomasz Wasilczyk <twasilczyk@pidgin.im>
date
Mon, 24 Feb 2014 18:15:13 +0100
changeset 35604
526382eb34de
parent 35603
08adaffc9b06 (current diff)
parent 35602
ba59da68fb79 (diff)
child 35605
8a0ae6cc73fc

Merge release-2.x.y

libpurple/gconf/Makefile.am file | annotate | diff | comparison | revisions
libpurple/plugins/perl/Makefile.am file | annotate | diff | comparison | revisions
pidgin/plugins/perl/Makefile.am file | annotate | diff | comparison | revisions
--- a/libpurple/plugins/perl/Makefile.am	Mon Feb 24 17:59:12 2014 +0100
+++ b/libpurple/plugins/perl/Makefile.am	Mon Feb 24 18:15:13 2014 +0100
@@ -137,6 +137,7 @@
 		$(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:
--- a/pidgin/plugins/perl/Makefile.am	Mon Feb 24 17:59:12 2014 +0100
+++ b/pidgin/plugins/perl/Makefile.am	Mon Feb 24 18:15:13 2014 +0100
@@ -80,6 +80,7 @@
 		$(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:

mercurial