From 38204308d6765606ddf02496a1abe598027c21c8 Mon Sep 17 00:00:00 2001 From: Todd Rinaldo Date: Sat, 30 Dec 2023 21:18:32 +0000 Subject: [PATCH] Sync from blead 8e23eb64b07b32a8971 --- Makefile.PL | 15 +++++++++++---- lib/Locale/Maketext.pm | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index e4a2717..212982d 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,4 +1,4 @@ -require 5.004; +require 5.006; # uses 'our' use strict; use ExtUtils::MakeMaker; @@ -14,7 +14,7 @@ WriteMakefile( }, dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', }, ( $ExtUtils::MakeMaker::VERSION >= 6.3002 ? ( 'LICENSE' => 'perl', ) : () ), - ( $] >= 5.008 && $] < 5.011 ) ? ( INSTALLDIRS => 'perl' ) : (), + INSTALLDIRS => ( $] < 5.011 ? 'perl' : 'site' ), # If under a version with Maketext in core, overwrite that core file. META_MERGE => { @@ -28,8 +28,15 @@ WriteMakefile( ); sub MY::postamble { - return <<'MAKE_FRAG'; -.PHONY: tags critic + # .PHONY is not portable + my $self = shift; + my $phony_line = $self->can('is_make_type') + && ($self->is_make_type('gmake') + || $self->is_make_type('bsdmake')) + ? '.PHONY: tags critic' + : ''; + + return "$phony_line\n\n" . <<'MAKE_FRAG'; tags: ctags -f tags --recurse --totals \ diff --git a/lib/Locale/Maketext.pm b/lib/Locale/Maketext.pm index 972f929..8979c20 100644 --- a/lib/Locale/Maketext.pm +++ b/lib/Locale/Maketext.pm @@ -25,7 +25,7 @@ BEGIN { } -our $VERSION = '1.32'; +our $VERSION = '1.33'; our @ISA = (); our $MATCH_SUPERS = 1;