Makefile: consistently use PERL_PATH
When injecting the Perl path into our scripts we sometimes use '@PERL@' while we othertimes use '@PERL_PATH@'. Refactor the code use the latter consistently, which makes it easier to reuse the same logic for multiple scripts. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Dec 6, 2024 at 14:24 UTC
c2a3b847eda3b51973998c1fa0a8749eb7e686b9
4 files changed
+5
-5
Makefile
+1
-1
@@ -2554,7 +2554,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
2554
-e 's/@USE_GETTEXT_SCHEME@/$(USE_GETTEXT_SCHEME)/g' \
2555
-e $(BROKEN_PATH_FIX) \
2556
-e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \
2557
- -e 's|@PERL@|$(PERL_PATH_SQ)|g' \
2557
+ -e 's|@PERL_PATH@|$(PERL_PATH_SQ)|g' \
2558
-e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \
2559
$@.sh >$@+
2560
endef
contrib/buildsystems/CMakeLists.txt
+1
-1
@@ -846,7 +846,7 @@ foreach(script ${git_shell_scripts})
846
string(REPLACE "@NO_CURL@" "" content "${content}")
847
string(REPLACE "@USE_GETTEXT_SCHEME@" "" content "${content}")
848
string(REPLACE "# @BROKEN_PATH_FIX@" "" content "${content}")
849
- string(REPLACE "@PERL@" "${PERL_PATH}" content "${content}")
849
+ string(REPLACE "@PERL_PATH@" "${PERL_PATH}" content "${content}")
850
string(REPLACE "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}")
851
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
852
endforeach()
git-instaweb.sh
+2
-2
@@ -3,7 +3,7 @@
3
# Copyright (c) 2006 Eric Wong
4
#
5
6
-PERL='@PERL@'
6
+PERL='@PERL_PATH@'
7
OPTIONS_KEEPDASHDASH=
8
OPTIONS_STUCKLONG=
9
OPTIONS_SPEC="\
@@ -716,7 +716,7 @@ EOF
716
717
gitweb_conf() {
718
cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
719
-#!@PERL@
719
+#!@PERL_PATH@
720
our \$projectroot = "$(dirname "$fqgitdir")";
721
our \$git_temp = "$fqgitdir/gitweb/tmp";
722
our \$projects_list = \$projectroot;
git-request-pull.sh
+1
-1
@@ -112,7 +112,7 @@ find_matching_ref='
112
}
113
'
114
115
-set fnord $(git ls-remote "$url" | @PERL@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
115
+set fnord $(git ls-remote "$url" | @PERL_PATH@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
116
remote_sha1=$2
117
ref=$3
118