[Pidgin] #15590: tag.sh path incorrect if $(MAKE) -C build is used
Pidgin
trac at pidgin.im
Thu Apr 11 20:07:29 EDT 2013
#15590: tag.sh path incorrect if $(MAKE) -C build is used
--------------------+-----------------------
Reporter: tusker | Owner:
Type: defect | Status: new
Milestone: 3.0.0 | Component: libpurple
Version: | Keywords:
--------------------+-----------------------
When building trunk using the ubuntu source, it fails to build due to the
way that the tag.sh is referred to. Modifying this to use the
$(top_srcdir) variable resolves this as below:
diff -r acd48a8a0b3b libpurple/plugins/perl/Makefile.am
--- a/libpurple/plugins/perl/Makefile.am Thu Apr 11 14:37:09 2013
+0200
+++ b/libpurple/plugins/perl/Makefile.am Fri Apr 12 10:00:36 2013
+1000
@@ -110,8 +110,8 @@
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="@$(top_srcdir)/libpurple/tag.sh CC $(CC)"
PERLRUN="@$(top_srcdir)/libpurple/tag.sh PERL $(PERL)"
CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
+ $(MAKE) CC="@$(top_srcdir)/libpurple/tag.sh CC $(CC)"
PERLRUN="@$(top_srcdir)/libpurple/tag.sh PERL $(PERL)"
CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
cd ..; \
done
diff -r acd48a8a0b3b pidgin/plugins/perl/Makefile.am
--- a/pidgin/plugins/perl/Makefile.am Thu Apr 11 14:37:09 2013 +0200
+++ b/pidgin/plugins/perl/Makefile.am Fri Apr 12 10:00:36 2013 +1000
@@ -55,8 +55,8 @@
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="@$(top_srcdir)/libpurple/tag.sh CC $(CC)"
PERLRUN="@$(top_srcdir)/libpurple/tag.sh PERL $(PERL)"
CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS) || \
+ $(MAKE) CC="@$(top_srcdir)/libpurple/tag.sh CC $(CC)"
PERLRUN="@$(top_srcdir)/libpurple/tag.sh PERL $(PERL)"
CCFLAGS="$(PERL_CFLAGS) $(CFLAGS)" $(PERL_EXTRA_OPTS)) && \
cd ..; \
done
--
Ticket URL: <https://developer.pidgin.im/ticket/15590>
Pidgin <http://pidgin.im>
Pidgin
More information about the Tracker
mailing list