Updated Branches: refs/heads/master cd6444bb4 -> 7b48d9b8b
TS-2046: fix perl module installation - Don't overwrite the automake-generated makefile. - Use the MakeMaker-generated makefile for installation. - Add $(DESTDIR) support; - Remove non-portable cp(1) options. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/7b48d9b8 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7b48d9b8 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7b48d9b8 Branch: refs/heads/master Commit: 7b48d9b8b4ee3d3ff9573571f4f664151c90af5d Parents: cd6444b Author: James Peach <[email protected]> Authored: Fri Jul 19 17:32:38 2013 -0700 Committer: James Peach <[email protected]> Committed: Fri Jul 19 17:32:38 2013 -0700 ---------------------------------------------------------------------- lib/perl/Makefile.PL | 1 + lib/perl/Makefile.am | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b48d9b8/lib/perl/Makefile.PL ---------------------------------------------------------------------- diff --git a/lib/perl/Makefile.PL b/lib/perl/Makefile.PL index b8ccfd0..eda0415 100644 --- a/lib/perl/Makefile.PL +++ b/lib/perl/Makefile.PL @@ -22,6 +22,7 @@ WriteMakefile( NAME => 'Apache::TS', VERSION_FROM => 'lib/Apache/TS.pm', # finds $VERSION PREREQ_PM => {}, # e.g., Module::Name => 1.1 + FIRST_MAKEFILE => 'Makefile-pl', ($] >= 5.005 ? ## Add these new keywords supported since 5.005 (ABSTRACT_FROM => 'lib/Apache/TS.pm', # retrieve abstract from module AUTHOR => 'Traffic Server Dev Team <[email protected]>') : ()), http://git-wip-us.apache.org/repos/asf/trafficserver/blob/7b48d9b8/lib/perl/Makefile.am ---------------------------------------------------------------------- diff --git a/lib/perl/Makefile.am b/lib/perl/Makefile.am index b931f8d..bd00a36 100644 --- a/lib/perl/Makefile.am +++ b/lib/perl/Makefile.am @@ -16,9 +16,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -all: Makefile.PL - -[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/. $(builddir)/. - perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) +Makefile-pl: $(srcdir)/Makefile.PL + -[ $(srcdir) != $(builddir) ] && cp -r $(abs_srcdir)/. $(builddir)/. + $(PERL) $(srcdir)/Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) -install-exec-local: Makefile.PL - perl Makefile.PL INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) install +install-exec-local: Makefile-pl + $(MAKE) -f Makefile-pl INSTALLDIRS=$(INSTALLDIRS) PREFIX=$(prefix) DESTDIR=$(DESTDIR) install
