Repository: trafficserver Updated Branches: refs/heads/master c33020e6a -> c7c8c942d
[TS-2728] The lib/perl Makefile.am does not properly detect in-source builds, generating errors. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c7c8c942 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c7c8c942 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c7c8c942 Branch: refs/heads/master Commit: c7c8c942d5b3ed17949570b5732a3f562268d39b Parents: c33020e Author: Leif Hedstrom <zw...@apache.org> Authored: Thu May 22 17:12:03 2014 -0600 Committer: Leif Hedstrom <zw...@apache.org> Committed: Thu May 22 17:12:03 2014 -0600 ---------------------------------------------------------------------- CHANGES | 3 +++ lib/perl/Makefile.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c7c8c942/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 319a627..d328a1f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 5.0.0 + *) [TS-2728] The lib/perl Makefile.am does not properly detect in-source + builds, generating errors. + *) [TS-2723] add new features to ts_lua plugin. Author: Quehan <que...@taobao.com> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c7c8c942/lib/perl/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am index f2457c5..bfba2af 100644 --- a/lib/perl/Makefile.am +++ b/lib/perl/Makefile.am @@ -25,7 +25,7 @@ install-exec-local: Makefile-pl # 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)" != "$(top_builddir)/$(subdir)" ] && cp -rf "$(srcdir)/." "$(top_builddir)/$(subdir)" + test -f "$(top_builddir)/$(subdir)/Makefile.PL" || cp -rf "$(srcdir)/." "$(top_builddir)/$(subdir)/" $(PERL) Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) distclean-local:
