Skip to content

Commit 4070c9e

Browse files
avargitster
authored andcommitted
Makefile: don't re-define PERL_DEFINES
Since 07d90ea (Makefile: add Perl runtime prefix support, 2018-04-10) we have been declaring PERL_DEFINES right after assigning to it, with the effect that the first PERL_DEFINES was ignored. That bug didn't matter in practice since the first line had all the same variables as the second, so we'd correctly re-generate everything. It just made for confusing reading. Let's remove that first assignment, and while we're at it split these across lines to make them more maintainable. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7e39198 commit 4070c9e

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2270,9 +2270,10 @@ perl_localedir_SQ = $(localedir_SQ)
22702270

22712271
ifndef NO_PERL
22722272
PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
2273-
PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ)
2274-
2275-
PERL_DEFINES := $(PERL_PATH_SQ) $(PERLLIB_EXTRA_SQ) $(perllibdir_SQ)
2273+
PERL_DEFINES :=
2274+
PERL_DEFINES += $(PERL_PATH_SQ)
2275+
PERL_DEFINES += $(PERLLIB_EXTRA_SQ)
2276+
PERL_DEFINES += $(perllibdir_SQ)
22762277
PERL_DEFINES += $(RUNTIME_PREFIX)
22772278

22782279
# Support Perl runtime prefix. In this mode, a different header is installed

0 commit comments

Comments
 (0)