From 10d472202dc2bf1fa5c569d2a14d460e95030564 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Tue, 21 Jul 2020 15:17:37 -0500 Subject: [PATCH] Fix some ca/perl builds Use the pre-expanded Perl configuration variables. Conda builds of Perl need these (and a fix to the Perl config files, see https://github.com/conda/conda/issues/8425 for details). --- modules/ca/src/perl/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/ca/src/perl/Makefile b/modules/ca/src/perl/Makefile index 65619e93e..532780d4c 100644 --- a/modules/ca/src/perl/Makefile +++ b/modules/ca/src/perl/Makefile @@ -13,11 +13,11 @@ ifdef T_A PERL_ARCHNAME = $(shell $(PERL) ../perlConfig.pl archname) PERL_ARCHPATH := $(PERL_VERSION)/$(PERL_ARCHNAME) - PERL_ARCHLIB := $(shell $(PERL) ../perlConfig.pl archlib) + PERL_ARCHLIB := $(shell $(PERL) ../perlConfig.pl archlibexp) PERL_h = $(PERL_ARCHLIB)/CORE/perl.h - EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils - PERLBIN := $(shell $(PERL) ../perlConfig.pl bin) + EXTUTILS := $(shell $(PERL) ../perlConfig.pl privlibexp)/ExtUtils + PERLBIN := $(shell $(PERL) ../perlConfig.pl binexp) XSUBPP := $(firstword $(wildcard $(PERLBIN)/xsubpp $(EXTUTILS)/xsubpp)) # Special settings for Darwin: