You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2013/09/10 18:06:38 UTC
git commit: TS-2207: CentOS5 out of tree perl module build fails
Updated Branches:
refs/heads/master cb9b0ffd8 -> 632b3a402
TS-2207: CentOS5 out of tree perl module build fails
The older version of automake on CentOS5 doesn't supply the $(builddir)
variable, possibly because it's implicitly the current working
directory. It also doesn't supply various $abs_ variables that later
versions do. Rewrite the copy using more fundamental automake
variables.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/632b3a40
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/632b3a40
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/632b3a40
Branch: refs/heads/master
Commit: 632b3a40241fc4459fc8126d5a0961ba08151021
Parents: cb9b0ff
Author: James Peach <jp...@apache.org>
Authored: Tue Sep 10 09:04:42 2013 -0700
Committer: James Peach <jp...@apache.org>
Committed: Tue Sep 10 09:04:42 2013 -0700
----------------------------------------------------------------------
CHANGES | 1 +
lib/perl/Makefile.am | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/632b3a40/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 868829d..20e1ef9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
-*- coding: utf-8 -*-
Changes with Apache Traffic Server 4.1.0
+ *) [TS-2207] CentOS5 out of tree perl module build fails.
*) [TS-1637] Fix nodes as idle/dead if we have not heard from them in awhile
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/632b3a40/lib/perl/Makefile.am
----------------------------------------------------------------------
diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am
index 0622e51..496f217 100644
--- a/lib/perl/Makefile.am
+++ b/lib/perl/Makefile.am
@@ -22,8 +22,10 @@ all-local: Makefile-pl
install-exec-local: Makefile-pl
$(MAKE) -f Makefile-pl INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) DESTDIR=$(DESTDIR) install
+# The perl build needs to have the source files in the current working directory, so we need to
+# copy them to the build directory if we are building out of tree.
Makefile-pl: Makefile.PL
- -[ $(srcdir) != $(builddir) ] && cp -rf $(abs_srcdir)/. $(builddir)/.
+ -[ "$(srcdir)" != "$(top_builddir)/$(subdir)" ] && cp -rf "$(srcdir)/." "$(top_builddir)/$(subdir)"
$(PERL) Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix)
distclean-local: