From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Wed, 5 May 2021 12:21:39 +0000 (+0200)
Subject: Makefile: regenerate perl/build/* if GIT-PERL-DEFINES changes
X-Git-Tag: v2.32.0-rc1~13^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3d49f7220a41147b17c1d826b9c87452b5f68c2c;p=thirdparty%2Fgit.git

Makefile: regenerate perl/build/* if GIT-PERL-DEFINES changes

Change the logic to generate perl/build/* to regenerate those files if
GIT-PERL-DEFINES changes. This ensures that e.g. changing localedir
will result in correctly re-generated files.

I don't think that ever worked. The brokenness pre-dates my
20d2a30f8ff (Makefile: replace perl/Makefile.PL with simple make
rules, 2017-12-10).

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Makefile b/Makefile
index 1d4c02e59d..a15f39e40f 100644
--- a/Makefile
+++ b/Makefile
@@ -2676,7 +2676,7 @@ endif
 NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS))
 endif
 
-perl/build/lib/%.pm: perl/%.pm
+perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES
 	$(QUIET_GEN)mkdir -p $(dir $@) && \
 	sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \
 	    -e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \