Skip to content

Commit c2a3b84

Browse files
pks-tgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a38edab commit c2a3b84

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2554,7 +2554,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
25542554
-e 's/@USE_GETTEXT_SCHEME@/$(USE_GETTEXT_SCHEME)/g' \
25552555
-e $(BROKEN_PATH_FIX) \
25562556
-e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \
2557-
-e 's|@PERL@|$(PERL_PATH_SQ)|g' \
2557+
-e 's|@PERL_PATH@|$(PERL_PATH_SQ)|g' \
25582558
-e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \
25592559
25602560
endef

contrib/buildsystems/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ foreach(script ${git_shell_scripts})
846846
string(REPLACE "@NO_CURL@" "" content "${content}")
847847
string(REPLACE "@USE_GETTEXT_SCHEME@" "" content "${content}")
848848
string(REPLACE "# @BROKEN_PATH_FIX@" "" content "${content}")
849-
string(REPLACE "@PERL@" "${PERL_PATH}" content "${content}")
849+
string(REPLACE "@PERL_PATH@" "${PERL_PATH}" content "${content}")
850850
string(REPLACE "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}")
851851
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
852852
endforeach()

git-instaweb.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Copyright (c) 2006 Eric Wong
44
#
55

6-
PERL='@PERL@'
6+
PERL='@PERL_PATH@'
77
OPTIONS_KEEPDASHDASH=
88
OPTIONS_STUCKLONG=
99
OPTIONS_SPEC="\
@@ -716,7 +716,7 @@ EOF
716716

717717
gitweb_conf() {
718718
cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
719-
#!@PERL@
719+
#!@PERL_PATH@
720720
our \$projectroot = "$(dirname "$fqgitdir")";
721721
our \$git_temp = "$fqgitdir/gitweb/tmp";
722722
our \$projects_list = \$projectroot;

git-request-pull.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ find_matching_ref='
112112
}
113113
'
114114

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")
116116
remote_sha1=$2
117117
ref=$3
118118

0 commit comments

Comments
 (0)