[PATCH v2 06/18] Makefile: guard Perl-only variable assignments
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Nov 12, 2021, 21:48 UTC
- Message-ID
- <patch-v2-06.18-eea89794493-20211112T214150Z-avarab@gmail.com>
- In-Reply-To
- <cover-v2-00.18-00000000000-20211112T214150Z-avarab@gmail.com>
Move the "ifndef NO_PERL" a few lines earlier to encompass the "perl_localedir_SQ" variable. We'll only use it under !NO_PERL.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile index 284725099c9..0cb10f00ebb 100644 --- a/Makefile +++ b/Makefile @@ -2291,11 +2291,11 @@ 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 +ifndef NO_PERL # 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)
-- 2.34.0.rc2.795.g926201d1cc8