Index: perl.mk =================================================================== --- perl.mk (revision 382) +++ perl.mk (revision 383) @@ -8,9 +8,10 @@ ifeq (${shell ${PERL} -e '${PERL_LEVEL}<500600 && print 1'},1) PERL_VER ?= ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d.%03d", $$1,$$2;'} +elif (${shell ${PERL} -e '${PERL_LEVEL}<501205 && print 1'},1) +PERL_VER ?= ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d.%d.%d", $$1,$$2,$$3;'} else -PERL_VER ?= ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d.%d.%d", $$1,$$2,$$3;'} -PERL_MAJOR_VER ?= ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d.%d", $$1,$$2;'} +PERL_VER ?= ${shell ${PERL} -e '$$]=~/(\d+)\.(\d{3})(\d+)/; printf "%d.%d", $$1,$$2;'} endif ifeq (${shell ${PERL} -e '${PERL_LEVEL}<500600 && print 1'},1) @@ -22,8 +23,6 @@ PERL_LIB ?= ${PREFIX}/lib/perl5/${PERL_VER} \ ${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \ ${PREFIX}/lib/perl5/site_perl \ - ${PREFIX}/lib/perl5/site_perl/${PERL_MAJOR_VER} \ - ${PREFIX}/lib/perl5/site_perl/${PERL_MAJOR_VER}/${PERL_ARCH} \ ${PREFIX}/lib/perl5/site_perl/${PERL_VER} \ ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH} PERL_LIBCOL ?= ${shell echo ${PERL_LIB} | perl -pe 's/\s+$$//; s/\s+/:/g'}