/pidgin/main: 999cd2afb976: Correctly specify the source path in...

Elliott Sales de Andrade qulogic at pidgin.im
Fri Apr 12 03:05:43 EDT 2013


Changeset: 999cd2afb9761dab0bbdb7a6b96a66595acde8ce
Author:	 Elliott Sales de Andrade <qulogic at pidgin.im>
Date:	 2013-04-12 02:03 -0400
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/999cd2afb976

Description:

Correctly specify the source path instead of relative paths.

Fixes #15590.

diffstat:

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

diffs (28 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
@@ -110,8 +110,8 @@ all-local: common/Makefile
 		if [ ! -f Makefile ]; then \
 			$(perlpath) Makefile.PL; \
 		fi && \
-		($(MAKE) CC="@../../../tag.sh CC $(CC)" PERLRUN="@../../../tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
-		 $(MAKE) CC="@../../../tag.sh CC $(CC)" PERLRUN="@../../../tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
+		($(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
+		 $(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
 		cd ..; \
 	done
 
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
@@ -55,8 +55,8 @@ all-local: common/Makefile
 		if [ ! -f Makefile ]; then \
 			$(perlpath) Makefile.PL; \
 		fi && \
-		($(MAKE) CC="@../../../../libpurple/tag.sh CC $(CC)" PERLRUN="@../../../../libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
-		$(MAKE) CC="@../../../../libpurple/tag.sh CC $(CC)" PERLRUN="@../../../../libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
+		($(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
+		$(MAKE) CC="@$(abs_top_srcdir)/libpurple/tag.sh CC $(CC)" PERLRUN="@$(abs_top_srcdir)/libpurple/tag.sh PERL $(PERL)" CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
 		cd ..; \
 	done
 



More information about the Commits mailing list