Fix several small issues with the dependency graph of the generated
"GIT-PERL-DEFINES" and "GIT-PERL-HEADER" files:
1. Folllow-up my 4070c9e09fc (Makefile: don't re-define PERL_DEFINES,
2021-05-05) and move the rest of the assignments to PERL_DEFINES to
one place, and change it from depending on "localedir_relative_SQ"
instead of "localedir".
The former is what we'll actually use, and while it's unlikely to
matter in practice (we'd just skip re-building these under
RUNTIME_PREFIX if the relative path was the same) it makes it
clearer what's going on here by bringing us to a 1=1 mapping of
these variables and what's subsequently used in the
"GIT-PERL-DEFINES", "GIT-PERL-HEADER" and "perl/build/lib/%.pm"
rules below.
2. We don't need the substitution of " " for ":" added in
07d90eadb50 (Makefile: add Perl runtime prefix support, 2018-04-10),
let's drop it. This doesn't matter for the correctness of these files,
but makes it clear that (unlike GIT-BUILD-OPTIONS) they are not
3. Don't have "GIT-PERL-HEADER" depend on the "Makefile". That was a
lazy way to over-declare the dependencies added in
f6a0ad4be71 (Makefile: generate Perl header from template file,
2018-04-10), now that our dependency graph is correct we can be
confident in dropping it.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index fd4fe6c1045..181dc52f152 100644
--- a/Makefile
+++ b/Makefile
@@ -2293,6 +2293,9 @@ $(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
ifndef NO_PERL
PERL_DEFINES =
+PERL_DEFINES += $(gitexecdir_relative_SQ)
+PERL_DEFINES += $(perllibdir_relative_SQ)
+PERL_DEFINES += $(localedir_relative_SQ)
PERL_DEFINES += $(PERL_PATH_SQ)
PERL_DEFINES += $(PERLLIB_EXTRA_SQ)
PERL_DEFINES += $(perllibdir_SQ)
@@ -2311,8 +2314,6 @@ else
PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
endif
-PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
-
$(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
$(QUIET_GEN) \
sed -e '1{' \
@@ -2325,7 +2326,6 @@ $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
chmod +x $@+ && \
mv $@+ $@
-PERL_DEFINES := $(subst $(space),:,$(PERL_DEFINES))
GIT-PERL-DEFINES: FORCE
@FLAGS='$(PERL_DEFINES)'; \
if test x"$$FLAGS" != x"`cat $@ 2>/dev/null`" ; then \
@@ -2333,7 +2333,7 @@ GIT-PERL-DEFINES: FORCE
echo "$$FLAGS" >$@; \
fi
-GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
+GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES
$(QUIET_GEN) \
INSTLIBDIR='$(perllibdir_SQ)' && \
INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
--
2.34.0.rc1.741.gab7bfd97031
