mirror of
https://github.com/git/git.git
synced 2025-02-06 10:03:06 +00:00
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>
This commit is contained in:
parent
a38edab7c8
commit
c2a3b847ed
2
Makefile
2
Makefile
@ -2554,7 +2554,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
||||
-e 's/@USE_GETTEXT_SCHEME@/$(USE_GETTEXT_SCHEME)/g' \
|
||||
-e $(BROKEN_PATH_FIX) \
|
||||
-e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \
|
||||
-e 's|@PERL@|$(PERL_PATH_SQ)|g' \
|
||||
-e 's|@PERL_PATH@|$(PERL_PATH_SQ)|g' \
|
||||
-e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \
|
||||
$@.sh >$@+
|
||||
endef
|
||||
|
@ -846,7 +846,7 @@ foreach(script ${git_shell_scripts})
|
||||
string(REPLACE "@NO_CURL@" "" content "${content}")
|
||||
string(REPLACE "@USE_GETTEXT_SCHEME@" "" content "${content}")
|
||||
string(REPLACE "# @BROKEN_PATH_FIX@" "" content "${content}")
|
||||
string(REPLACE "@PERL@" "${PERL_PATH}" content "${content}")
|
||||
string(REPLACE "@PERL_PATH@" "${PERL_PATH}" content "${content}")
|
||||
string(REPLACE "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}")
|
||||
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
|
||||
endforeach()
|
||||
|
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2006 Eric Wong
|
||||
#
|
||||
|
||||
PERL='@PERL@'
|
||||
PERL='@PERL_PATH@'
|
||||
OPTIONS_KEEPDASHDASH=
|
||||
OPTIONS_STUCKLONG=
|
||||
OPTIONS_SPEC="\
|
||||
@ -716,7 +716,7 @@ EOF
|
||||
|
||||
gitweb_conf() {
|
||||
cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
|
||||
#!@PERL@
|
||||
#!@PERL_PATH@
|
||||
our \$projectroot = "$(dirname "$fqgitdir")";
|
||||
our \$git_temp = "$fqgitdir/gitweb/tmp";
|
||||
our \$projects_list = \$projectroot;
|
||||
|
@ -112,7 +112,7 @@ find_matching_ref='
|
||||
}
|
||||
'
|
||||
|
||||
set fnord $(git ls-remote "$url" | @PERL@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
|
||||
set fnord $(git ls-remote "$url" | @PERL_PATH@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
|
||||
remote_sha1=$2
|
||||
ref=$3
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user