Move the assignment to perl_localedir_SQ to be guarded by NO_PERL, and furthermore only assign to it if RUNTIME_PREFIX is in effect. If the latter isn't being used then we'll default to the empty string, so there was no need for the second assignment added in 07d90eadb50 (Makefile: add Perl runtime prefix support, 2018-04-10). Similarly, we can move the PERL_HEADER_TEMPLATE assignment inside the "!NO_PERL" block, and having simplified all of this let's consolidate three comments on this control flow into one. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> --- Makefile | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 009b08152b5..fd4fe6c1045 100644 --- a/Makefile +++ b/Makefile @@ -2291,12 +2291,7 @@ git.res: git.rc GIT-VERSION-FILE GIT-PREFIX # This makes sure we depend on the NO_PERL setting itself. $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS -# Used for substitution in Perl modules. Disabled when using RUNTIME_PREFIX -# since the locale directory is injected. -perl_localedir_SQ = $(localedir_SQ) - ifndef NO_PERL -PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl PERL_DEFINES = PERL_DEFINES += $(PERL_PATH_SQ) PERL_DEFINES += $(PERLLIB_EXTRA_SQ) @@ -2305,16 +2300,15 @@ PERL_DEFINES += $(RUNTIME_PREFIX) PERL_DEFINES += $(NO_PERL_CPAN_FALLBACKS) PERL_DEFINES += $(NO_GETTEXT) -# Support Perl runtime prefix. In this mode, a different header is installed -# into Perl scripts. +# Under RUNTIME_PREFIX we inject a header into the Perl scripts; If +# NO_GETTEXT is not defined we'll make use of the localedir. ifdef RUNTIME_PREFIX - PERL_HEADER_TEMPLATE = perl/header_templates/runtime_prefix.template.pl - -# Don't export a fixed $(localedir) path; it will be resolved by the Perl header -# at runtime. -perl_localedir_SQ = - +ifndef NO_GETTEXT +perl_localedir_SQ = $(localedir_SQ) +endif +else +PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl endif PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir) -- 2.34.0.rc1.741.gab7bfd97031
