Skip to content

Commit dbe46c0

Browse files
pks-tgitster
pks-t
authored and
gitster
committed
Makefile: consistently use @Placeholder@ to substitute
We have a bunch of placeholders in our scripts that we replace at build time, for example by using sed(1). These placeholders come in three different formats: @Placeholder@, @@Placeholder@@ and ++PLACEHOLDER++. Next to being inconsistent it also creates a bit of a problem with CMake, which only supports the first syntax in its `configure_file()` function. To work around that we instead manually replace placeholders via string operations, which is a hassle and removes safeguards that CMake has to verify that we didn't forget to replace any placeholders. Besides that, other build systems like Meson also support the CMake syntax. Unify our codebase to consistently use the syntax supported by such build systems. Signed-off-by: Patrick Steinhardt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4638e88 commit dbe46c0

18 files changed

+119
-119
lines changed

‎Makefile

+22-22
Original file line numberDiff line numberDiff line change
@@ -1555,10 +1555,10 @@ endif
15551555

15561556
ifdef SANE_TOOL_PATH
15571557
SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
1558-
BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
1558+
BROKEN_PATH_FIX = 's|^\# @BROKEN_PATH_FIX@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
15591559
PATH := $(SANE_TOOL_PATH):${PATH}
15601560
else
1561-
BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
1561+
BROKEN_PATH_FIX = '/^\# @BROKEN_PATH_FIX@$$/d'
15621562
endif
15631563

15641564
ifeq (,$(HOST_CPU))
@@ -2548,13 +2548,13 @@ GIT-SCRIPT-DEFINES: FORCE
25482548
define cmd_munge_script
25492549
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
25502550
-e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
2551-
-e 's|@@DIFF@@|$(DIFF_SQ)|' \
2552-
-e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
2553-
-e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
2551+
-e 's|@DIFF@|$(DIFF_SQ)|' \
2552+
-e 's|@LOCALEDIR@|$(localedir_SQ)|g' \
2553+
-e 's/@USE_GETTEXT_SCHEME@/$(USE_GETTEXT_SCHEME)/g' \
25542554
-e $(BROKEN_PATH_FIX) \
2555-
-e 's|@@GITWEBDIR@@|$(gitwebdir_SQ)|g' \
2556-
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
2557-
-e 's|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
2555+
-e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \
2556+
-e 's|@PERL@|$(PERL_PATH_SQ)|g' \
2557+
-e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \
25582558
[email protected] >$@+
25592559
endef
25602560

@@ -2611,7 +2611,7 @@ $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
26112611
-e ' r GIT-PERL-HEADER' \
26122612
-e ' G' \
26132613
-e '}' \
2614-
-e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
2614+
-e 's/@GIT_VERSION@/$(GIT_VERSION)/g' \
26152615
$< >$@+ && \
26162616
chmod +x $@+ && \
26172617
mv $@+ $@
@@ -2629,11 +2629,11 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
26292629
INSTLIBDIR='$(perllibdir_SQ)' && \
26302630
INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
26312631
INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
2632-
sed -e 's=@@PATHSEP@@=$(pathsep)=g' \
2633-
-e "s=@@INSTLIBDIR@@=$$INSTLIBDIR=g" \
2634-
-e 's=@@PERLLIBDIR_REL@@=$(perllibdir_relative_SQ)=g' \
2635-
-e 's=@@GITEXECDIR_REL@@=$(gitexecdir_relative_SQ)=g' \
2636-
-e 's=@@LOCALEDIR_REL@@=$(localedir_relative_SQ)=g' \
2632+
sed -e 's=@PATHSEP@=$(pathsep)=g' \
2633+
-e "s=@INSTLIBDIR@=$$INSTLIBDIR=g" \
2634+
-e 's=@PERLLIBDIR_REL@=$(perllibdir_relative_SQ)=g' \
2635+
-e 's=@GITEXECDIR_REL@=$(gitexecdir_relative_SQ)=g' \
2636+
-e 's=@LOCALEDIR_REL@=$(localedir_relative_SQ)=g' \
26372637
$< >$@+ && \
26382638
mv $@+ $@
26392639

@@ -2649,7 +2649,7 @@ else # NO_PERL
26492649
$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
26502650
$(QUIET_GEN) \
26512651
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
2652-
-e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
2652+
-e 's|@REASON@|NO_PERL=$(NO_PERL)|g' \
26532653
unimplemented.sh >$@+ && \
26542654
chmod +x $@+ && \
26552655
mv $@+ $@
@@ -2670,13 +2670,13 @@ else # NO_PYTHON
26702670
$(SCRIPT_PYTHON_GEN): % : unimplemented.sh
26712671
$(QUIET_GEN) \
26722672
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
2673-
-e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \
2673+
-e 's|@REASON@|NO_PYTHON=$(NO_PYTHON)|g' \
26742674
unimplemented.sh >$@+ && \
26752675
chmod +x $@+ && \
26762676
mv $@+ $@
26772677
endif # NO_PYTHON
26782678

2679-
CONFIGURE_RECIPE = sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
2679+
CONFIGURE_RECIPE = sed -e 's/@GIT_VERSION@/$(GIT_VERSION)/g' \
26802680
configure.ac >configure.ac+ && \
26812681
autoconf -o configure configure.ac+ && \
26822682
$(RM) configure.ac+
@@ -3104,9 +3104,9 @@ endif
31043104
perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES
31053105
$(call mkdir_p_parent_template)
31063106
$(QUIET_GEN) \
3107-
sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \
3108-
-e 's|@@NO_GETTEXT@@|$(NO_GETTEXT_SQ)|g' \
3109-
-e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
3107+
sed -e 's|@LOCALEDIR@|$(perl_localedir_SQ)|g' \
3108+
-e 's|@NO_GETTEXT@|$(NO_GETTEXT_SQ)|g' \
3109+
-e 's|@NO_PERL_CPAN_FALLBACKS@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
31103110
< $< > $@
31113111

31123112
perl/build/man/man3/Git.3pm: perl/Git.pm
@@ -3231,8 +3231,8 @@ all:: $(TEST_PROGRAMS) $(test_bindir_programs) $(UNIT_TEST_PROGS) $(CLAR_TEST_PR
32313231
bin-wrappers/%: wrap-for-bin.sh
32323232
$(call mkdir_p_parent_template)
32333233
$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
3234-
-e 's|@@BUILD_DIR@@|$(shell pwd)|' \
3235-
-e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))$(if $(filter-out $(BINDIR_PROGRAMS_NO_X),$(@F)),$(X),)|' < $< > $@ && \
3234+
-e 's|@BUILD_DIR@|$(shell pwd)|' \
3235+
-e 's|@PROG@|$(patsubst test-%,t/helper/test-%,$(@F))$(if $(filter-out $(BINDIR_PROGRAMS_NO_X),$(@F)),$(X),)|' < $< > $@ && \
32363236
chmod +x $@
32373237

32383238
# GNU make supports exporting all variables by "export" without parameters.

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ fi
142142
## Configure body starts here.
143143

144144
AC_PREREQ(2.59)
145-
AC_INIT([git], [@@GIT_VERSION@@], [[email protected]])
145+
AC_INIT([git], [@GIT_VERSION@], [[email protected]])
146146

147147
AC_CONFIG_SRCDIR([git.c])
148148

‎contrib/buildsystems/CMakeLists.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -836,14 +836,14 @@ set(git_shell_scripts
836836
foreach(script ${git_shell_scripts})
837837
file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.sh content NEWLINE_CONSUME)
838838
string(REPLACE "@SHELL_PATH@" "${SHELL_PATH}" content "${content}")
839-
string(REPLACE "@@DIFF@@" "diff" content "${content}")
839+
string(REPLACE "@DIFF@" "diff" content "${content}")
840840
string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
841841
string(REPLACE "@GITWEBDIR@" "${GITWEBDIR}" content "${content}")
842-
string(REPLACE "@@NO_CURL@@" "" content "${content}")
843-
string(REPLACE "@@USE_GETTEXT_SCHEME@@" "" content "${content}")
844-
string(REPLACE "# @@BROKEN_PATH_FIX@@" "" content "${content}")
845-
string(REPLACE "@@PERL@@" "${PERL_PATH}" content "${content}")
846-
string(REPLACE "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}")
842+
string(REPLACE "@NO_CURL@" "" content "${content}")
843+
string(REPLACE "@USE_GETTEXT_SCHEME@" "" content "${content}")
844+
string(REPLACE "# @BROKEN_PATH_FIX@" "" content "${content}")
845+
string(REPLACE "@PERL@" "${PERL_PATH}" content "${content}")
846+
string(REPLACE "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}")
847847
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
848848
endforeach()
849849

@@ -852,13 +852,13 @@ parse_makefile_for_scripts(git_perl_scripts "SCRIPT_PERL" ".perl")
852852

853853
#create perl header
854854
file(STRINGS ${CMAKE_SOURCE_DIR}/perl/header_templates/fixed_prefix.template.pl perl_header )
855-
string(REPLACE "@@PATHSEP@@" ":" perl_header "${perl_header}")
856-
string(REPLACE "@@INSTLIBDIR@@" "${INSTLIBDIR}" perl_header "${perl_header}")
855+
string(REPLACE "@PATHSEP@" ":" perl_header "${perl_header}")
856+
string(REPLACE "@INSTLIBDIR@" "${INSTLIBDIR}" perl_header "${perl_header}")
857857

858858
foreach(script ${git_perl_scripts})
859859
file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.perl content NEWLINE_CONSUME)
860860
string(REPLACE "#!/usr/bin/perl" "#!/usr/bin/perl\n${perl_header}\n" content "${content}")
861-
string(REPLACE "@@GIT_VERSION@@" "${PROJECT_VERSION}" content "${content}")
861+
string(REPLACE "@GIT_VERSION@" "${PROJECT_VERSION}" content "${content}")
862862
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
863863
endforeach()
864864

@@ -873,8 +873,8 @@ file(GLOB_RECURSE perl_modules "${CMAKE_SOURCE_DIR}/perl/*.pm")
873873
foreach(pm ${perl_modules})
874874
string(REPLACE "${CMAKE_SOURCE_DIR}/perl/" "" file_path ${pm})
875875
file(STRINGS ${pm} content NEWLINE_CONSUME)
876-
string(REPLACE "@@LOCALEDIR@@" "${LOCALEDIR}" content "${content}")
877-
string(REPLACE "@@NO_PERL_CPAN_FALLBACKS@@" "" content "${content}")
876+
string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
877+
string(REPLACE "@NO_PERL_CPAN_FALLBACKS@" "" content "${content}")
878878
file(WRITE ${CMAKE_BINARY_DIR}/perl/build/lib/${file_path} ${content})
879879
#test-lib.sh requires perl/build/lib to be the build directory of perl modules
880880
endforeach()
@@ -1064,21 +1064,21 @@ set(wrapper_test_scripts
10641064

10651065
foreach(script ${wrapper_scripts})
10661066
file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
1067-
string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
1068-
string(REPLACE "@@PROG@@" "${script}${EXE_EXTENSION}" content "${content}")
1067+
string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
1068+
string(REPLACE "@PROG@" "${script}${EXE_EXTENSION}" content "${content}")
10691069
file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
10701070
endforeach()
10711071

10721072
foreach(script ${wrapper_test_scripts})
10731073
file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
1074-
string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
1075-
string(REPLACE "@@PROG@@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
1074+
string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
1075+
string(REPLACE "@PROG@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
10761076
file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
10771077
endforeach()
10781078

10791079
file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
1080-
string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
1081-
string(REPLACE "@@PROG@@" "git-cvsserver" content "${content}")
1080+
string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
1081+
string(REPLACE "@PROG@" "git-cvsserver" content "${content}")
10821082
file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/git-cvsserver ${content})
10831083

10841084
#options for configuring test options

‎git-cvsserver.perl

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
use File::Basename;
2727
use Getopt::Long qw(:config require_order no_ignore_case);
2828

29-
my $VERSION = '@@GIT_VERSION@@';
29+
my $VERSION = '@GIT_VERSION@';
3030

3131
my $log = GITCVS::log->new();
3232
my $cfg;

‎git-instaweb.sh

+4-4
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@'
77
OPTIONS_KEEPDASHDASH=
88
OPTIONS_STUCKLONG=
99
OPTIONS_SPEC="\
@@ -38,8 +38,8 @@ conf="$GIT_DIR/gitweb/httpd.conf"
3838
# if installed, it doesn't need further configuration (module_path)
3939
test -z "$httpd" && httpd='lighttpd -f'
4040

41-
# Default is @@GITWEBDIR@@
42-
test -z "$root" && root='@@GITWEBDIR@@'
41+
# Default is @GITWEBDIR@
42+
test -z "$root" && root='@GITWEBDIR@'
4343

4444
# any untaken local port will do...
4545
test -z "$port" && port=1234
@@ -716,7 +716,7 @@ EOF
716716

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

‎git-request-pull.sh

+1-1
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@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
116116
remote_sha1=$2
117117
ref=$3
118118

‎git-send-email.perl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ sub gen_header {
15011501
@recipients = unique_email_list(@recipients,@cc,@initial_bcc);
15021502
@recipients = (map { extract_valid_address_or_die($_) } @recipients);
15031503
my $date = format_2822_time($time++);
1504-
my $gitversion = '@@GIT_VERSION@@';
1504+
my $gitversion = '@GIT_VERSION@';
15051505
if ($gitversion =~ m/..GIT_VERSION../) {
15061506
$gitversion = Git::version();
15071507
}

‎git-sh-i18n.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ TEXTDOMAIN=git
99
export TEXTDOMAIN
1010
if test -z "$GIT_TEXTDOMAINDIR"
1111
then
12-
TEXTDOMAINDIR="@@LOCALEDIR@@"
12+
TEXTDOMAINDIR="@LOCALEDIR@"
1313
else
1414
TEXTDOMAINDIR="$GIT_TEXTDOMAINDIR"
1515
fi
1616
export TEXTDOMAINDIR
1717

1818
# First decide what scheme to use...
1919
GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
20-
if test -n "@@USE_GETTEXT_SCHEME@@"
20+
if test -n "@USE_GETTEXT_SCHEME@"
2121
then
22-
GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
22+
GIT_INTERNAL_GETTEXT_SH_SCHEME="@USE_GETTEXT_SCHEME@"
2323
elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
2424
then
2525
: no probing necessary

‎git-sh-setup.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ git_broken_path_fix () {
4141
esac
4242
}
4343
44-
# @@BROKEN_PATH_FIX@@
44+
# @BROKEN_PATH_FIX@
4545
4646
# Source git-sh-i18n for gettext support.
4747
. "$(git --exec-path)/git-sh-i18n"
@@ -154,7 +154,7 @@ git_pager() {
154154
else
155155
GIT_PAGER=cat
156156
fi
157-
for vardef in @@PAGER_ENV@@
157+
for vardef in @PAGER_ENV@
158158
do
159159
var=${vardef%%=*}
160160
eval ": \"\${$vardef}\" && export $var"
@@ -280,7 +280,7 @@ get_author_ident_from_commit () {
280280
# remove lines from $1 that are not in $2, leaving only common lines.
281281
create_virtual_base() {
282282
sz0=$(wc -c <"$1")
283-
@@DIFF@@ -u -La/"$1" -Lb/"$1" "$1" "$2" | git apply --no-add
283+
@DIFF@ -u -La/"$1" -Lb/"$1" "$1" "$2" | git apply --no-add
284284
sz1=$(wc -c <"$1")
285285
286286
# If we do not have enough common material, it is not

‎git-svn.perl

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
$_revision $_repository
1010
$_q $_authors $_authors_prog %users/;
1111
$AUTHOR = 'Eric Wong <[email protected]>';
12-
$VERSION = '@@GIT_VERSION@@';
12+
$VERSION = '@GIT_VERSION@';
1313

1414
use Carp qw/croak/;
1515
use File::Basename qw/dirname basename/;

‎gitweb/Makefile

+22-22
Original file line numberDiff line numberDiff line change
@@ -79,28 +79,28 @@ GITWEB_JSLIB_FILES += static/js/blame_incremental.js
7979

8080

8181
GITWEB_REPLACE = \
82-
-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
83-
-e 's|++GIT_BINDIR++|$(bindir)|g' \
84-
-e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
85-
-e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \
86-
-e 's|++GITWEB_CONFIG_COMMON++|$(GITWEB_CONFIG_COMMON)|g' \
87-
-e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
88-
-e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
89-
-e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
90-
-e 's|"++GITWEB_PROJECT_MAXDEPTH++"|$(GITWEB_PROJECT_MAXDEPTH)|g' \
91-
-e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \
92-
-e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \
93-
-e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \
94-
-e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
95-
-e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
96-
-e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
97-
-e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
98-
-e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
99-
-e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \
100-
-e 's|++GITWEB_SITE_HTML_HEAD_STRING++|$(GITWEB_SITE_HTML_HEAD_STRING)|g' \
101-
-e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
102-
-e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
103-
-e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g'
82+
-e 's|@GIT_VERSION@|$(GIT_VERSION)|g' \
83+
-e 's|@GIT_BINDIR@|$(bindir)|g' \
84+
-e 's|@GITWEB_CONFIG@|$(GITWEB_CONFIG)|g' \
85+
-e 's|@GITWEB_CONFIG_SYSTEM@|$(GITWEB_CONFIG_SYSTEM)|g' \
86+
-e 's|@GITWEB_CONFIG_COMMON@|$(GITWEB_CONFIG_COMMON)|g' \
87+
-e 's|@GITWEB_HOME_LINK_STR@|$(GITWEB_HOME_LINK_STR)|g' \
88+
-e 's|@GITWEB_SITENAME@|$(GITWEB_SITENAME)|g' \
89+
-e 's|@GITWEB_PROJECTROOT@|$(GITWEB_PROJECTROOT)|g' \
90+
-e 's|"@GITWEB_PROJECT_MAXDEPTH@"|$(GITWEB_PROJECT_MAXDEPTH)|g' \
91+
-e 's|@GITWEB_EXPORT_OK@|$(GITWEB_EXPORT_OK)|g' \
92+
-e 's|@GITWEB_STRICT_EXPORT@|$(GITWEB_STRICT_EXPORT)|g' \
93+
-e 's|@GITWEB_BASE_URL@|$(GITWEB_BASE_URL)|g' \
94+
-e 's|@GITWEB_LIST@|$(GITWEB_LIST)|g' \
95+
-e 's|@GITWEB_HOMETEXT@|$(GITWEB_HOMETEXT)|g' \
96+
-e 's|@GITWEB_CSS@|$(GITWEB_CSS)|g' \
97+
-e 's|@GITWEB_LOGO@|$(GITWEB_LOGO)|g' \
98+
-e 's|@GITWEB_FAVICON@|$(GITWEB_FAVICON)|g' \
99+
-e 's|@GITWEB_JS@|$(GITWEB_JS)|g' \
100+
-e 's|@GITWEB_SITE_HTML_HEAD_STRING@|$(GITWEB_SITE_HTML_HEAD_STRING)|g' \
101+
-e 's|@GITWEB_SITE_HEADER@|$(GITWEB_SITE_HEADER)|g' \
102+
-e 's|@GITWEB_SITE_FOOTER@|$(GITWEB_SITE_FOOTER)|g' \
103+
-e 's|@HIGHLIGHT_BIN@|$(HIGHLIGHT_BIN)|g'
104104

105105
.PHONY: FORCE
106106
$(MAK_DIR_GITWEB)GITWEB-BUILD-OPTIONS: FORCE

0 commit comments

Comments
 (0)