diff mbox series

[RFC,15/21] Makefile: consistently use @PLACEHOLDER@ to substitute

Message ID 6aaf3263228eefab2478e744197f7d4b651795da.1727881164.git.ps@pks.im (mailing list archive)
State Superseded
Headers show
Series Modernize the build system | expand

Commit Message

Patrick Steinhardt Oct. 2, 2024, 3:16 p.m. UTC 
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. To work around that we
instead manually replace such strings via string operations, which is
both a hassle and also 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 <ps@pks.im>
---
 Makefile                                      | 42 +++++++++---------
 configure.ac                                  |  2 +-
 contrib/buildsystems/CMakeLists.txt           | 34 +++++++-------
 generate-perl.sh                              |  2 +-
 git-cvsserver.perl                            |  2 +-
 git-instaweb.sh                               |  8 ++--
 git-request-pull.sh                           |  2 +-
 git-send-email.perl                           |  2 +-
 git-sh-i18n.sh                                |  6 +--
 git-sh-setup.sh                               |  6 +--
 git-svn.perl                                  |  2 +-
 gitk-git/po/vi.po                             |  2 +-
 gitweb/Makefile                               | 44 +++++++++----------
 gitweb/gitweb.perl                            | 44 +++++++++----------
 perl/Git/I18N.pm                              |  6 +--
 perl/Git/LoadCPAN.pm                          |  6 +--
 .../header_templates/fixed_prefix.template.pl |  2 +-
 .../runtime_prefix.template.pl                |  8 ++--
 unimplemented.sh                              |  2 +-
 wrap-for-bin.sh                               | 18 ++++----
 20 files changed, 120 insertions(+), 120 deletions(-)

Comments

Phillip Wood Oct. 8, 2024, 2:04 p.m. UTC | #1 
Hi Patrick

On 02/10/2024 16:16, Patrick Steinhardt wrote:
> 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++.

I agree that it's a good idea to stanardise on a single format here.

> Next to being inconsistent it also creates a bit of a problem with
> CMake, which only supports the first syntax.

I'm a bit confused - is this referring to CMake's "configure_file" command?

> To work around that we
> instead manually replace such strings via string operations, which is
> both a hassle and also 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.

Sounds good!

Phillip

> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>   Makefile                                      | 42 +++++++++---------
>   configure.ac                                  |  2 +-
>   contrib/buildsystems/CMakeLists.txt           | 34 +++++++-------
>   generate-perl.sh                              |  2 +-
>   git-cvsserver.perl                            |  2 +-
>   git-instaweb.sh                               |  8 ++--
>   git-request-pull.sh                           |  2 +-
>   git-send-email.perl                           |  2 +-
>   git-sh-i18n.sh                                |  6 +--
>   git-sh-setup.sh                               |  6 +--
>   git-svn.perl                                  |  2 +-
>   gitk-git/po/vi.po                             |  2 +-
>   gitweb/Makefile                               | 44 +++++++++----------
>   gitweb/gitweb.perl                            | 44 +++++++++----------
>   perl/Git/I18N.pm                              |  6 +--
>   perl/Git/LoadCPAN.pm                          |  6 +--
>   .../header_templates/fixed_prefix.template.pl |  2 +-
>   .../runtime_prefix.template.pl                |  8 ++--
>   unimplemented.sh                              |  2 +-
>   wrap-for-bin.sh                               | 18 ++++----
>   20 files changed, 120 insertions(+), 120 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index e92ecd0c51..91e64c1222 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1552,10 +1552,10 @@ endif
>   
>   ifdef SANE_TOOL_PATH
>   SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
> -BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
> +BROKEN_PATH_FIX = 's|^\# @BROKEN_PATH_FIX@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
>   PATH := $(SANE_TOOL_PATH):${PATH}
>   else
> -BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
> +BROKEN_PATH_FIX = '/^\# @BROKEN_PATH_FIX@$$/d'
>   endif
>   
>   ifeq (,$(HOST_CPU))
> @@ -2524,13 +2524,13 @@ GIT-SCRIPT-DEFINES: FORCE
>   define cmd_munge_script
>   sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
>       -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
> -    -e 's|@@DIFF@@|$(DIFF_SQ)|' \
> -    -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
> -    -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
> +    -e 's|@DIFF@|$(DIFF_SQ)|' \
> +    -e 's|@LOCALEDIR@|$(localedir_SQ)|g' \
> +    -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|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
> +    -e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \
> +    -e 's|@PERL@|$(PERL_PATH_SQ)|g' \
> +    -e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \
>       $@.sh >$@+
>   endef
>   
> @@ -2597,11 +2597,11 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
>   	INSTLIBDIR='$(perllibdir_SQ)' && \
>   	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
>   	INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
> -	sed -e 's=@@PATHSEP@@=$(pathsep)=g' \
> -	    -e "s=@@INSTLIBDIR@@=$$INSTLIBDIR=g" \
> -	    -e 's=@@PERLLIBDIR_REL@@=$(perllibdir_relative_SQ)=g' \
> -	    -e 's=@@GITEXECDIR_REL@@=$(gitexecdir_relative_SQ)=g' \
> -	    -e 's=@@LOCALEDIR_REL@@=$(localedir_relative_SQ)=g' \
> +	sed -e 's=@PATHSEP@=$(pathsep)=g' \
> +	    -e "s=@INSTLIBDIR@=$$INSTLIBDIR=g" \
> +	    -e 's=@PERLLIBDIR_REL@=$(perllibdir_relative_SQ)=g' \
> +	    -e 's=@GITEXECDIR_REL@=$(gitexecdir_relative_SQ)=g' \
> +	    -e 's=@LOCALEDIR_REL@=$(localedir_relative_SQ)=g' \
>   	    $< >$@+ && \
>   	mv $@+ $@
>   
> @@ -2617,7 +2617,7 @@ else # NO_PERL
>   $(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
>   	$(QUIET_GEN) \
>   	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
> -	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
> +	    -e 's|@REASON@|NO_PERL=$(NO_PERL)|g' \
>   	    unimplemented.sh >$@+ && \
>   	chmod +x $@+ && \
>   	mv $@+ $@
> @@ -2638,13 +2638,13 @@ else # NO_PYTHON
>   $(SCRIPT_PYTHON_GEN): % : unimplemented.sh
>   	$(QUIET_GEN) \
>   	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
> -	    -e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \
> +	    -e 's|@REASON@|NO_PYTHON=$(NO_PYTHON)|g' \
>   	    unimplemented.sh >$@+ && \
>   	chmod +x $@+ && \
>   	mv $@+ $@
>   endif # NO_PYTHON
>   
> -CONFIGURE_RECIPE = sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
> +CONFIGURE_RECIPE = sed -e 's/@GIT_VERSION@/$(GIT_VERSION)/g' \
>   			configure.ac >configure.ac+ && \
>   		   autoconf -o configure configure.ac+ && \
>   		   $(RM) configure.ac+
> @@ -3073,9 +3073,9 @@ endif
>   perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES
>   	$(call mkdir_p_parent_template)
>   	$(QUIET_GEN) \
> -	sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \
> -	    -e 's|@@NO_GETTEXT@@|$(NO_GETTEXT_SQ)|g' \
> -	    -e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
> +	sed -e 's|@LOCALEDIR@|$(perl_localedir_SQ)|g' \
> +	    -e 's|@NO_GETTEXT@|$(NO_GETTEXT_SQ)|g' \
> +	    -e 's|@NO_PERL_CPAN_FALLBACKS@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
>   	< $< > $@
>   
>   perl/build/man/man3/Git.3pm: perl/Git.pm
> @@ -3192,8 +3192,8 @@ all:: $(TEST_PROGRAMS) $(test_bindir_programs) $(UNIT_TEST_PROGS) $(CLAR_TEST_PR
>   bin-wrappers/%: wrap-for-bin.sh
>   	$(call mkdir_p_parent_template)
>   	$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
> -	     -e 's|@@BUILD_DIR@@|$(shell pwd)|' \
> -	     -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))$(if $(filter-out $(BINDIR_PROGRAMS_NO_X),$(@F)),$(X),)|' < $< > $@ && \
> +	     -e 's|@BUILD_DIR@|$(shell pwd)|' \
> +	     -e 's|@PROG@|$(patsubst test-%,t/helper/test-%,$(@F))$(if $(filter-out $(BINDIR_PROGRAMS_NO_X),$(@F)),$(X),)|' < $< > $@ && \
>   	chmod +x $@
>   
>   # GNU make supports exporting all variables by "export" without parameters.
> diff --git a/configure.ac b/configure.ac
> index d1a96da14e..5923edc44a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -142,7 +142,7 @@ fi
>   ## Configure body starts here.
>   
>   AC_PREREQ(2.59)
> -AC_INIT([git], [@@GIT_VERSION@@], [git@vger.kernel.org])
> +AC_INIT([git], [@GIT_VERSION@], [git@vger.kernel.org])
>   
>   AC_CONFIG_SRCDIR([git.c])
>   
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index 2ba15155b3..bf029b9428 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -833,14 +833,14 @@ set(git_shell_scripts
>   foreach(script ${git_shell_scripts})
>   	file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.sh content NEWLINE_CONSUME)
>   	string(REPLACE "@SHELL_PATH@" "${SHELL_PATH}" content "${content}")
> -	string(REPLACE "@@DIFF@@" "diff" content "${content}")
> +	string(REPLACE "@DIFF@" "diff" content "${content}")
>   	string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
>   	string(REPLACE "@GITWEBDIR@" "${GITWEBDIR}" content "${content}")
> -	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 "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}")
> +	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 "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}")
>   	file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
>   endforeach()
>   
> @@ -849,13 +849,13 @@ parse_makefile_for_scripts(git_perl_scripts "SCRIPT_PERL" ".perl")
>   
>   #create perl header
>   file(STRINGS ${CMAKE_SOURCE_DIR}/perl/header_templates/fixed_prefix.template.pl perl_header )
> -string(REPLACE "@@PATHSEP@@" ":" perl_header "${perl_header}")
> -string(REPLACE "@@INSTLIBDIR@@" "${INSTLIBDIR}" perl_header "${perl_header}")
> +string(REPLACE "@PATHSEP@" ":" perl_header "${perl_header}")
> +string(REPLACE "@INSTLIBDIR@" "${INSTLIBDIR}" perl_header "${perl_header}")
>   
>   foreach(script ${git_perl_scripts})
>   	file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.perl content NEWLINE_CONSUME)
>   	string(REPLACE "#!/usr/bin/perl" "#!/usr/bin/perl\n${perl_header}\n" content "${content}")
> -	string(REPLACE "@@GIT_VERSION@@" "${PROJECT_VERSION}" content "${content}")
> +	string(REPLACE "@GIT_VERSION@" "${PROJECT_VERSION}" content "${content}")
>   	file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
>   endforeach()
>   
> @@ -870,8 +870,8 @@ file(GLOB_RECURSE perl_modules "${CMAKE_SOURCE_DIR}/perl/*.pm")
>   foreach(pm ${perl_modules})
>   	string(REPLACE "${CMAKE_SOURCE_DIR}/perl/" "" file_path ${pm})
>   	file(STRINGS ${pm} content NEWLINE_CONSUME)
> -	string(REPLACE "@@LOCALEDIR@@" "${LOCALEDIR}" content "${content}")
> -	string(REPLACE "@@NO_PERL_CPAN_FALLBACKS@@" "" content "${content}")
> +	string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
> +	string(REPLACE "@NO_PERL_CPAN_FALLBACKS@" "" content "${content}")
>   	file(WRITE ${CMAKE_BINARY_DIR}/perl/build/lib/${file_path} ${content})
>   #test-lib.sh requires perl/build/lib to be the build directory of perl modules
>   endforeach()
> @@ -1079,21 +1079,21 @@ set(wrapper_test_scripts
>   
>   foreach(script ${wrapper_scripts})
>   	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
> -	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
> -	string(REPLACE "@@PROG@@" "${script}${EXE_EXTENSION}" content "${content}")
> +	string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
> +	string(REPLACE "@PROG@" "${script}${EXE_EXTENSION}" content "${content}")
>   	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
>   endforeach()
>   
>   foreach(script ${wrapper_test_scripts})
>   	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
> -	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
> -	string(REPLACE "@@PROG@@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
> +	string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
> +	string(REPLACE "@PROG@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
>   	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
>   endforeach()
>   
>   file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
> -string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
> -string(REPLACE "@@PROG@@" "git-cvsserver" content "${content}")
> +string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
> +string(REPLACE "@PROG@" "git-cvsserver" content "${content}")
>   file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/git-cvsserver ${content})
>   
>   #options for configuring test options
> diff --git a/generate-perl.sh b/generate-perl.sh
> index b9e04d6f42..41d78da029 100755
> --- a/generate-perl.sh
> +++ b/generate-perl.sh
> @@ -17,6 +17,6 @@ sed -e '1{' \
>       -e "	r $PERL_HEADER" \
>       -e '	G' \
>       -e '}' \
> -    -e "s/@@GIT_VERSION@@/$GIT_VERSION/g" \
> +    -e "s/@GIT_VERSION@/$GIT_VERSION/g" \
>       "$PERL_SCRIPT" >"$OUT"
>   chmod a+x "$OUT"
> diff --git a/git-cvsserver.perl b/git-cvsserver.perl
> index 124f598bdc..70ae7cb8e4 100755
> --- a/git-cvsserver.perl
> +++ b/git-cvsserver.perl
> @@ -26,7 +26,7 @@
>   use File::Basename;
>   use Getopt::Long qw(:config require_order no_ignore_case);
>   
> -my $VERSION = '@@GIT_VERSION@@';
> +my $VERSION = '@GIT_VERSION@';
>   
>   my $log = GITCVS::log->new();
>   my $cfg;
> diff --git a/git-instaweb.sh b/git-instaweb.sh
> index 8dbe21d588..c8efb1205a 100755
> --- a/git-instaweb.sh
> +++ b/git-instaweb.sh
> @@ -3,7 +3,7 @@
>   # Copyright (c) 2006 Eric Wong
>   #
>   
> -PERL='@@PERL@@'
> +PERL='@PERL@'
>   OPTIONS_KEEPDASHDASH=
>   OPTIONS_STUCKLONG=
>   OPTIONS_SPEC="\
> @@ -38,8 +38,8 @@ conf="$GIT_DIR/gitweb/httpd.conf"
>   # if installed, it doesn't need further configuration (module_path)
>   test -z "$httpd" && httpd='lighttpd -f'
>   
> -# Default is @@GITWEBDIR@@
> -test -z "$root" && root='@@GITWEBDIR@@'
> +# Default is @GITWEBDIR@
> +test -z "$root" && root='@GITWEBDIR@'
>   
>   # any untaken local port will do...
>   test -z "$port" && port=1234
> @@ -716,7 +716,7 @@ EOF
>   
>   gitweb_conf() {
>   	cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
> -#!@@PERL@@
> +#!@PERL@
>   our \$projectroot = "$(dirname "$fqgitdir")";
>   our \$git_temp = "$fqgitdir/gitweb/tmp";
>   our \$projects_list = \$projectroot;
> diff --git a/git-request-pull.sh b/git-request-pull.sh
> index 01640a044b..10c88639e2 100755
> --- a/git-request-pull.sh
> +++ b/git-request-pull.sh
> @@ -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@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
>   remote_sha1=$2
>   ref=$3
>   
> diff --git a/git-send-email.perl b/git-send-email.perl
> index c835d4c11a..02805c43e5 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -1501,7 +1501,7 @@ sub gen_header {
>   	@recipients = unique_email_list(@recipients,@cc,@initial_bcc);
>   	@recipients = (map { extract_valid_address_or_die($_) } @recipients);
>   	my $date = format_2822_time($time++);
> -	my $gitversion = '@@GIT_VERSION@@';
> +	my $gitversion = '@GIT_VERSION@';
>   	if ($gitversion =~ m/..GIT_VERSION../) {
>   	    $gitversion = Git::version();
>   	}
> diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
> index a15c0620db..ae4b2d6ba9 100644
> --- a/git-sh-i18n.sh
> +++ b/git-sh-i18n.sh
> @@ -9,7 +9,7 @@ TEXTDOMAIN=git
>   export TEXTDOMAIN
>   if test -z "$GIT_TEXTDOMAINDIR"
>   then
> -	TEXTDOMAINDIR="@@LOCALEDIR@@"
> +	TEXTDOMAINDIR="@LOCALEDIR@"
>   else
>   	TEXTDOMAINDIR="$GIT_TEXTDOMAINDIR"
>   fi
> @@ -17,9 +17,9 @@ export TEXTDOMAINDIR
>   
>   # First decide what scheme to use...
>   GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
> -if test -n "@@USE_GETTEXT_SCHEME@@"
> +if test -n "@USE_GETTEXT_SCHEME@"
>   then
> -	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
> +	GIT_INTERNAL_GETTEXT_SH_SCHEME="@USE_GETTEXT_SCHEME@"
>   elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
>   then
>   	: no probing necessary
> diff --git a/git-sh-setup.sh b/git-sh-setup.sh
> index ce273fe0e4..19aef72ec2 100644
> --- a/git-sh-setup.sh
> +++ b/git-sh-setup.sh
> @@ -41,7 +41,7 @@ git_broken_path_fix () {
>   	esac
>   }
>   
> -# @@BROKEN_PATH_FIX@@
> +# @BROKEN_PATH_FIX@
>   
>   # Source git-sh-i18n for gettext support.
>   . "$(git --exec-path)/git-sh-i18n"
> @@ -154,7 +154,7 @@ git_pager() {
>   	else
>   		GIT_PAGER=cat
>   	fi
> -	for vardef in @@PAGER_ENV@@
> +	for vardef in @PAGER_ENV@
>   	do
>   		var=${vardef%%=*}
>   		eval ": \"\${$vardef}\" && export $var"
> @@ -280,7 +280,7 @@ get_author_ident_from_commit () {
>   # remove lines from $1 that are not in $2, leaving only common lines.
>   create_virtual_base() {
>   	sz0=$(wc -c <"$1")
> -	@@DIFF@@ -u -La/"$1" -Lb/"$1" "$1" "$2" | git apply --no-add
> +	@DIFF@ -u -La/"$1" -Lb/"$1" "$1" "$2" | git apply --no-add
>   	sz1=$(wc -c <"$1")
>   
>   	# If we do not have enough common material, it is not
> diff --git a/git-svn.perl b/git-svn.perl
> index 01e7a70de1..dcf65cf1d1 100755
> --- a/git-svn.perl
> +++ b/git-svn.perl
> @@ -9,7 +9,7 @@
>   		$_revision $_repository
>   		$_q $_authors $_authors_prog %users/;
>   $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
> -$VERSION = '@@GIT_VERSION@@';
> +$VERSION = '@GIT_VERSION@';
>   
>   use Carp qw/croak/;
>   use File::Basename qw/dirname basename/;
> diff --git a/gitk-git/po/vi.po b/gitk-git/po/vi.po
> index 5967498660..184430dcde 100644
> --- a/gitk-git/po/vi.po
> +++ b/gitk-git/po/vi.po
> @@ -5,7 +5,7 @@
>   #
>   msgid ""
>   msgstr ""
> -"Project-Id-Version: gitk @@GIT_VERSION@@\n"
> +"Project-Id-Version: gitk @GIT_VERSION@\n"
>   "Report-Msgid-Bugs-To: \n"
>   "POT-Creation-Date: 2015-05-17 14:32+1000\n"
>   "PO-Revision-Date: 2015-09-15 07:33+0700\n"
> diff --git a/gitweb/Makefile b/gitweb/Makefile
> index 3b68ab2d67..164c8d5375 100644
> --- a/gitweb/Makefile
> +++ b/gitweb/Makefile
> @@ -79,28 +79,28 @@ GITWEB_JSLIB_FILES += static/js/blame_incremental.js
>   
>   
>   GITWEB_REPLACE = \
> -	-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
> -	-e 's|++GIT_BINDIR++|$(bindir)|g' \
> -	-e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
> -	-e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \
> -	-e 's|++GITWEB_CONFIG_COMMON++|$(GITWEB_CONFIG_COMMON)|g' \
> -	-e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
> -	-e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
> -	-e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
> -	-e 's|"++GITWEB_PROJECT_MAXDEPTH++"|$(GITWEB_PROJECT_MAXDEPTH)|g' \
> -	-e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \
> -	-e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \
> -	-e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \
> -	-e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
> -	-e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
> -	-e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
> -	-e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
> -	-e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
> -	-e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \
> -	-e 's|++GITWEB_SITE_HTML_HEAD_STRING++|$(GITWEB_SITE_HTML_HEAD_STRING)|g' \
> -	-e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
> -	-e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
> -	-e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g'
> +	-e 's|@GIT_VERSION@|$(GIT_VERSION)|g' \
> +	-e 's|@GIT_BINDIR@|$(bindir)|g' \
> +	-e 's|@GITWEB_CONFIG@|$(GITWEB_CONFIG)|g' \
> +	-e 's|@GITWEB_CONFIG_SYSTEM@|$(GITWEB_CONFIG_SYSTEM)|g' \
> +	-e 's|@GITWEB_CONFIG_COMMON@|$(GITWEB_CONFIG_COMMON)|g' \
> +	-e 's|@GITWEB_HOME_LINK_STR@|$(GITWEB_HOME_LINK_STR)|g' \
> +	-e 's|@GITWEB_SITENAME@|$(GITWEB_SITENAME)|g' \
> +	-e 's|@GITWEB_PROJECTROOT@|$(GITWEB_PROJECTROOT)|g' \
> +	-e 's|"@GITWEB_PROJECT_MAXDEPTH@"|$(GITWEB_PROJECT_MAXDEPTH)|g' \
> +	-e 's|@GITWEB_EXPORT_OK@|$(GITWEB_EXPORT_OK)|g' \
> +	-e 's|@GITWEB_STRICT_EXPORT@|$(GITWEB_STRICT_EXPORT)|g' \
> +	-e 's|@GITWEB_BASE_URL@|$(GITWEB_BASE_URL)|g' \
> +	-e 's|@GITWEB_LIST@|$(GITWEB_LIST)|g' \
> +	-e 's|@GITWEB_HOMETEXT@|$(GITWEB_HOMETEXT)|g' \
> +	-e 's|@GITWEB_CSS@|$(GITWEB_CSS)|g' \
> +	-e 's|@GITWEB_LOGO@|$(GITWEB_LOGO)|g' \
> +	-e 's|@GITWEB_FAVICON@|$(GITWEB_FAVICON)|g' \
> +	-e 's|@GITWEB_JS@|$(GITWEB_JS)|g' \
> +	-e 's|@GITWEB_SITE_HTML_HEAD_STRING@|$(GITWEB_SITE_HTML_HEAD_STRING)|g' \
> +	-e 's|@GITWEB_SITE_HEADER@|$(GITWEB_SITE_HEADER)|g' \
> +	-e 's|@GITWEB_SITE_FOOTER@|$(GITWEB_SITE_FOOTER)|g' \
> +	-e 's|@HIGHLIGHT_BIN@|$(HIGHLIGHT_BIN)|g'
>   
>   .PHONY: FORCE
>   $(MAK_DIR_GITWEB)GITWEB-BUILD-OPTIONS: FORCE
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index b09a8d0523..76e1f4e244 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -35,7 +35,7 @@ BEGIN
>   	CGI->compile() if $ENV{'MOD_PERL'};
>   }
>   
> -our $version = "++GIT_VERSION++";
> +our $version = "@GIT_VERSION@";
>   
>   our ($my_url, $my_uri, $base_url, $path_info, $home_link);
>   sub evaluate_uri {
> @@ -80,46 +80,46 @@ sub evaluate_uri {
>   
>   # core git executable to use
>   # this can just be "git" if your webserver has a sensible PATH
> -our $GIT = "++GIT_BINDIR++/git";
> +our $GIT = "@GIT_BINDIR@/git";
>   
>   # absolute fs-path which will be prepended to the project path
>   #our $projectroot = "/pub/scm";
> -our $projectroot = "++GITWEB_PROJECTROOT++";
> +our $projectroot = "@GITWEB_PROJECTROOT@";
>   
>   # fs traversing limit for getting project list
>   # the number is relative to the projectroot
> -our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++";
> +our $project_maxdepth = "@GITWEB_PROJECT_MAXDEPTH@";
>   
>   # string of the home link on top of all pages
> -our $home_link_str = "++GITWEB_HOME_LINK_STR++";
> +our $home_link_str = "@GITWEB_HOME_LINK_STR@";
>   
>   # extra breadcrumbs preceding the home link
>   our @extra_breadcrumbs = ();
>   
>   # name of your site or organization to appear in page titles
>   # replace this with something more descriptive for clearer bookmarks
> -our $site_name = "++GITWEB_SITENAME++"
> +our $site_name = "@GITWEB_SITENAME@"
>                    || ($ENV{'SERVER_NAME'} || "Untitled") . " Git";
>   
>   # html snippet to include in the <head> section of each page
> -our $site_html_head_string = "++GITWEB_SITE_HTML_HEAD_STRING++";
> +our $site_html_head_string = "@GITWEB_SITE_HTML_HEAD_STRING@";
>   # filename of html text to include at top of each page
> -our $site_header = "++GITWEB_SITE_HEADER++";
> +our $site_header = "@GITWEB_SITE_HEADER@";
>   # html text to include at home page
> -our $home_text = "++GITWEB_HOMETEXT++";
> +our $home_text = "@GITWEB_HOMETEXT@";
>   # filename of html text to include at bottom of each page
> -our $site_footer = "++GITWEB_SITE_FOOTER++";
> +our $site_footer = "@GITWEB_SITE_FOOTER@";
>   
>   # URI of stylesheets
> -our @stylesheets = ("++GITWEB_CSS++");
> +our @stylesheets = ("@GITWEB_CSS@");
>   # URI of a single stylesheet, which can be overridden in GITWEB_CONFIG.
>   our $stylesheet = undef;
>   # URI of GIT logo (72x27 size)
> -our $logo = "++GITWEB_LOGO++";
> +our $logo = "@GITWEB_LOGO@";
>   # URI of GIT favicon, assumed to be image/png type
> -our $favicon = "++GITWEB_FAVICON++";
> +our $favicon = "@GITWEB_FAVICON@";
>   # URI of gitweb.js (JavaScript code for gitweb)
> -our $javascript = "++GITWEB_JS++";
> +our $javascript = "@GITWEB_JS@";
>   
>   # URI and label (title) of GIT logo link
>   #our $logo_url = "https://www.kernel.org/pub/software/scm/git/docs/";
> @@ -128,7 +128,7 @@ sub evaluate_uri {
>   our $logo_label = "git homepage";
>   
>   # source of projects list
> -our $projects_list = "++GITWEB_LIST++";
> +our $projects_list = "@GITWEB_LIST@";
>   
>   # the width (in characters) of the projects list "Description" column
>   our $projects_list_description_width = 25;
> @@ -147,7 +147,7 @@ sub evaluate_uri {
>   
>   # show repository only if this file exists
>   # (only effective if this variable evaluates to true)
> -our $export_ok = "++GITWEB_EXPORT_OK++";
> +our $export_ok = "@GITWEB_EXPORT_OK@";
>   
>   # don't generate age column on the projects list page
>   our $omit_age_column = 0;
> @@ -161,11 +161,11 @@ sub evaluate_uri {
>   our $export_auth_hook = undef;
>   
>   # only allow viewing of repositories also shown on the overview page
> -our $strict_export = "++GITWEB_STRICT_EXPORT++";
> +our $strict_export = "@GITWEB_STRICT_EXPORT@";
>   
>   # list of git base URLs used for URL to where fetch project from,
>   # i.e. full URL is "$git_base_url/$project"
> -our @git_base_url_list = grep { $_ ne '' } ("++GITWEB_BASE_URL++");
> +our @git_base_url_list = grep { $_ ne '' } ("@GITWEB_BASE_URL@");
>   
>   # default blob_plain mimetype and default charset for text/plain blob
>   our $default_blob_plain_mimetype = 'text/plain';
> @@ -200,7 +200,7 @@ sub evaluate_uri {
>   # http://andre-simon.de/zip/download.php due to assumptions about parameters and output).
>   # Useful if highlight is not installed on your webserver's PATH.
>   # [Default: highlight]
> -our $highlight_bin = "++HIGHLIGHT_BIN++";
> +our $highlight_bin = "@HIGHLIGHT_BIN@";
>   
>   # information about snapshot formats that gitweb is capable of serving
>   our %known_snapshot_formats = (
> @@ -741,9 +741,9 @@ sub read_config_file {
>   
>   our ($GITWEB_CONFIG, $GITWEB_CONFIG_SYSTEM, $GITWEB_CONFIG_COMMON);
>   sub evaluate_gitweb_config {
> -	our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
> -	our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
> -	our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "++GITWEB_CONFIG_COMMON++";
> +	our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "@GITWEB_CONFIG@";
> +	our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "@GITWEB_CONFIG_SYSTEM@";
> +	our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "@GITWEB_CONFIG_COMMON@";
>   
>   	# Protect against duplications of file names, to not read config twice.
>   	# Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so
> diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
> index 5454c3a6d2..1da830c98a 100644
> --- a/perl/Git/I18N.pm
> +++ b/perl/Git/I18N.pm
> @@ -20,14 +20,14 @@ BEGIN
>   # this "'@@' [...] '@@'" pattern.
>   use constant NO_GETTEXT_STR => '@@' . 'NO_GETTEXT' . '@@';
>   use constant NO_GETTEXT => (
> -	q[@@NO_GETTEXT@@] ne ''
> +	q[@NO_GETTEXT@] ne ''
>   	and
> -	q[@@NO_GETTEXT@@] ne NO_GETTEXT_STR
> +	q[@NO_GETTEXT@] ne NO_GETTEXT_STR
>   );
>   
>   sub __bootstrap_locale_messages {
>   	our $TEXTDOMAIN = 'git';
> -	our $TEXTDOMAINDIR ||= $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@';
> +	our $TEXTDOMAINDIR ||= $ENV{GIT_TEXTDOMAINDIR} || '@LOCALEDIR@';
>   	die "NO_GETTEXT=" . NO_GETTEXT_STR if NO_GETTEXT;
>   
>   	require POSIX;
> diff --git a/perl/Git/LoadCPAN.pm b/perl/Git/LoadCPAN.pm
> index 8c7fa805f9..6be99840f8 100644
> --- a/perl/Git/LoadCPAN.pm
> +++ b/perl/Git/LoadCPAN.pm
> @@ -31,11 +31,11 @@ =head1 DESCRIPTION
>   # Makefile, and allows for detecting whether the module is loaded from
>   # perl/Git as opposed to perl/build/Git, which is useful for one-off
>   # testing without having Error.pm et al installed.
> -use constant NO_PERL_CPAN_FALLBACKS_STR => '@@' . 'NO_PERL_CPAN_FALLBACKS' . '@@';
> +use constant NO_PERL_CPAN_FALLBACKS_STR => '@' . 'NO_PERL_CPAN_FALLBACKS' . '@';
>   use constant NO_PERL_CPAN_FALLBACKS => (
> -	q[@@NO_PERL_CPAN_FALLBACKS@@] ne ''
> +	q[@NO_PERL_CPAN_FALLBACKS@] ne ''
>   	and
> -	q[@@NO_PERL_CPAN_FALLBACKS@@] ne NO_PERL_CPAN_FALLBACKS_STR
> +	q[@NO_PERL_CPAN_FALLBACKS@] ne NO_PERL_CPAN_FALLBACKS_STR
>   );
>   
>   sub import {
> diff --git a/perl/header_templates/fixed_prefix.template.pl b/perl/header_templates/fixed_prefix.template.pl
> index 857b4391a4..d571ca5cde 100644
> --- a/perl/header_templates/fixed_prefix.template.pl
> +++ b/perl/header_templates/fixed_prefix.template.pl
> @@ -1 +1 @@
> -use lib (split(/@@PATHSEP@@/, $ENV{GITPERLLIB} || '@@INSTLIBDIR@@'));
> +use lib (split(/@PATHSEP@/, $ENV{GITPERLLIB} || '@INSTLIBDIR@'));
> diff --git a/perl/header_templates/runtime_prefix.template.pl b/perl/header_templates/runtime_prefix.template.pl
> index 9d28b3d863..e6f8e661a1 100644
> --- a/perl/header_templates/runtime_prefix.template.pl
> +++ b/perl/header_templates/runtime_prefix.template.pl
> @@ -3,7 +3,7 @@
>   # This finds our Git::* libraries relative to the script's runtime path.
>   sub __git_system_path {
>   	my ($relpath) = @_;
> -	my $gitexecdir_relative = '@@GITEXECDIR_REL@@';
> +	my $gitexecdir_relative = '@GITEXECDIR_REL@';
>   
>   	# GIT_EXEC_PATH is supplied by `git` or the test suite.
>   	my $exec_path;
> @@ -24,11 +24,11 @@ sub __git_system_path {
>   }
>   
>   BEGIN {
> -	use lib split /@@PATHSEP@@/,
> +	use lib split /@PATHSEP@/,
>   	(
>   		$ENV{GITPERLLIB} ||
>   		do {
> -			my $perllibdir = __git_system_path('@@PERLLIBDIR_REL@@');
> +			my $perllibdir = __git_system_path('@PERLLIBDIR_REL@');
>   			(-e $perllibdir) || die("Invalid system path ($relpath): $path");
>   			$perllibdir;
>   		}
> @@ -36,7 +36,7 @@ BEGIN
>   
>   	# Export the system locale directory to the I18N module. The locale directory
>   	# is only installed if NO_GETTEXT is set.
> -	$Git::I18N::TEXTDOMAINDIR = __git_system_path('@@LOCALEDIR_REL@@');
> +	$Git::I18N::TEXTDOMAINDIR = __git_system_path('@LOCALEDIR_REL@');
>   }
>   
>   # END RUNTIME_PREFIX generated code.
> diff --git a/unimplemented.sh b/unimplemented.sh
> index fee21d24e8..41776b279d 100644
> --- a/unimplemented.sh
> +++ b/unimplemented.sh
> @@ -1,4 +1,4 @@
>   #!/bin/sh
>   
> -echo >&2 "fatal: git was built without support for $(basename $0) (@@REASON@@)."
> +echo >&2 "fatal: git was built without support for $(basename $0) (@REASON@)."
>   exit 128
> diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh
> index 95851b85b6..7898a1c238 100644
> --- a/wrap-for-bin.sh
> +++ b/wrap-for-bin.sh
> @@ -4,33 +4,33 @@
>   # to run test suite against sandbox, but with only bindir-installed
>   # executables in PATH.  The Makefile copies this into various
>   # files in bin-wrappers, substituting
> -# @@BUILD_DIR@@ and @@PROG@@.
> +# @BUILD_DIR@ and @PROG@.
>   
> -GIT_EXEC_PATH='@@BUILD_DIR@@'
> +GIT_EXEC_PATH='@BUILD_DIR@'
>   if test -n "$NO_SET_GIT_TEMPLATE_DIR"
>   then
>   	unset GIT_TEMPLATE_DIR
>   else
> -	GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt'
> +	GIT_TEMPLATE_DIR='@BUILD_DIR@/templates/blt'
>   	export GIT_TEMPLATE_DIR
>   fi
> -GITPERLLIB='@@BUILD_DIR@@/perl/build/lib'"${GITPERLLIB:+:$GITPERLLIB}"
> -GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
> -PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
> +GITPERLLIB='@BUILD_DIR@/perl/build/lib'"${GITPERLLIB:+:$GITPERLLIB}"
> +GIT_TEXTDOMAINDIR='@BUILD_DIR@/po/build/locale'
> +PATH='@BUILD_DIR@/bin-wrappers:'"$PATH"
>   
>   export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR
>   
>   case "$GIT_DEBUGGER" in
>   '')
> -	exec "${GIT_EXEC_PATH}/@@PROG@@" "$@"
> +	exec "${GIT_EXEC_PATH}/@PROG@" "$@"
>   	;;
>   1)
>   	unset GIT_DEBUGGER
> -	exec gdb --args "${GIT_EXEC_PATH}/@@PROG@@" "$@"
> +	exec gdb --args "${GIT_EXEC_PATH}/@PROG@" "$@"
>   	;;
>   *)
>   	GIT_DEBUGGER_ARGS="$GIT_DEBUGGER"
>   	unset GIT_DEBUGGER
> -	exec ${GIT_DEBUGGER_ARGS} "${GIT_EXEC_PATH}/@@PROG@@" "$@"
> +	exec ${GIT_DEBUGGER_ARGS} "${GIT_EXEC_PATH}/@PROG@" "$@"
>   	;;
>   esac
Patrick Steinhardt Oct. 8, 2024, 2:23 p.m. UTC | #2 
On Tue, Oct 08, 2024 at 03:04:29PM +0100, Phillip Wood wrote:
> Hi Patrick
> 
> On 02/10/2024 16:16, Patrick Steinhardt wrote:
> > 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++.
> 
> I agree that it's a good idea to stanardise on a single format here.
> 
> > Next to being inconsistent it also creates a bit of a problem with
> > CMake, which only supports the first syntax.
> 
> I'm a bit confused - is this referring to CMake's "configure_file" command?

Ah, yes. I should've made this more explicit.

Patrick
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index e92ecd0c51..91e64c1222 100644
--- a/Makefile
+++ b/Makefile
@@ -1552,10 +1552,10 @@  endif
 
 ifdef SANE_TOOL_PATH
 SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
-BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
+BROKEN_PATH_FIX = 's|^\# @BROKEN_PATH_FIX@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
 PATH := $(SANE_TOOL_PATH):${PATH}
 else
-BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
+BROKEN_PATH_FIX = '/^\# @BROKEN_PATH_FIX@$$/d'
 endif
 
 ifeq (,$(HOST_CPU))
@@ -2524,13 +2524,13 @@  GIT-SCRIPT-DEFINES: FORCE
 define cmd_munge_script
 sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
     -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
-    -e 's|@@DIFF@@|$(DIFF_SQ)|' \
-    -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \
-    -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \
+    -e 's|@DIFF@|$(DIFF_SQ)|' \
+    -e 's|@LOCALEDIR@|$(localedir_SQ)|g' \
+    -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|@@PAGER_ENV@@|$(PAGER_ENV_SQ)|g' \
+    -e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \
+    -e 's|@PERL@|$(PERL_PATH_SQ)|g' \
+    -e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \
     $@.sh >$@+
 endef
 
@@ -2597,11 +2597,11 @@  GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
 	INSTLIBDIR='$(perllibdir_SQ)' && \
 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
 	INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
-	sed -e 's=@@PATHSEP@@=$(pathsep)=g' \
-	    -e "s=@@INSTLIBDIR@@=$$INSTLIBDIR=g" \
-	    -e 's=@@PERLLIBDIR_REL@@=$(perllibdir_relative_SQ)=g' \
-	    -e 's=@@GITEXECDIR_REL@@=$(gitexecdir_relative_SQ)=g' \
-	    -e 's=@@LOCALEDIR_REL@@=$(localedir_relative_SQ)=g' \
+	sed -e 's=@PATHSEP@=$(pathsep)=g' \
+	    -e "s=@INSTLIBDIR@=$$INSTLIBDIR=g" \
+	    -e 's=@PERLLIBDIR_REL@=$(perllibdir_relative_SQ)=g' \
+	    -e 's=@GITEXECDIR_REL@=$(gitexecdir_relative_SQ)=g' \
+	    -e 's=@LOCALEDIR_REL@=$(localedir_relative_SQ)=g' \
 	    $< >$@+ && \
 	mv $@+ $@
 
@@ -2617,7 +2617,7 @@  else # NO_PERL
 $(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
 	$(QUIET_GEN) \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+	    -e 's|@REASON@|NO_PERL=$(NO_PERL)|g' \
 	    unimplemented.sh >$@+ && \
 	chmod +x $@+ && \
 	mv $@+ $@
@@ -2638,13 +2638,13 @@  else # NO_PYTHON
 $(SCRIPT_PYTHON_GEN): % : unimplemented.sh
 	$(QUIET_GEN) \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-	    -e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \
+	    -e 's|@REASON@|NO_PYTHON=$(NO_PYTHON)|g' \
 	    unimplemented.sh >$@+ && \
 	chmod +x $@+ && \
 	mv $@+ $@
 endif # NO_PYTHON
 
-CONFIGURE_RECIPE = sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+CONFIGURE_RECIPE = sed -e 's/@GIT_VERSION@/$(GIT_VERSION)/g' \
 			configure.ac >configure.ac+ && \
 		   autoconf -o configure configure.ac+ && \
 		   $(RM) configure.ac+
@@ -3073,9 +3073,9 @@  endif
 perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES
 	$(call mkdir_p_parent_template)
 	$(QUIET_GEN) \
-	sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \
-	    -e 's|@@NO_GETTEXT@@|$(NO_GETTEXT_SQ)|g' \
-	    -e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
+	sed -e 's|@LOCALEDIR@|$(perl_localedir_SQ)|g' \
+	    -e 's|@NO_GETTEXT@|$(NO_GETTEXT_SQ)|g' \
+	    -e 's|@NO_PERL_CPAN_FALLBACKS@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
 	< $< > $@
 
 perl/build/man/man3/Git.3pm: perl/Git.pm
@@ -3192,8 +3192,8 @@  all:: $(TEST_PROGRAMS) $(test_bindir_programs) $(UNIT_TEST_PROGS) $(CLAR_TEST_PR
 bin-wrappers/%: wrap-for-bin.sh
 	$(call mkdir_p_parent_template)
 	$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-	     -e 's|@@BUILD_DIR@@|$(shell pwd)|' \
-	     -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))$(if $(filter-out $(BINDIR_PROGRAMS_NO_X),$(@F)),$(X),)|' < $< > $@ && \
+	     -e 's|@BUILD_DIR@|$(shell pwd)|' \
+	     -e 's|@PROG@|$(patsubst test-%,t/helper/test-%,$(@F))$(if $(filter-out $(BINDIR_PROGRAMS_NO_X),$(@F)),$(X),)|' < $< > $@ && \
 	chmod +x $@
 
 # GNU make supports exporting all variables by "export" without parameters.
diff --git a/configure.ac b/configure.ac
index d1a96da14e..5923edc44a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,7 +142,7 @@  fi
 ## Configure body starts here.
 
 AC_PREREQ(2.59)
-AC_INIT([git], [@@GIT_VERSION@@], [git@vger.kernel.org])
+AC_INIT([git], [@GIT_VERSION@], [git@vger.kernel.org])
 
 AC_CONFIG_SRCDIR([git.c])
 
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index 2ba15155b3..bf029b9428 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -833,14 +833,14 @@  set(git_shell_scripts
 foreach(script ${git_shell_scripts})
 	file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.sh content NEWLINE_CONSUME)
 	string(REPLACE "@SHELL_PATH@" "${SHELL_PATH}" content "${content}")
-	string(REPLACE "@@DIFF@@" "diff" content "${content}")
+	string(REPLACE "@DIFF@" "diff" content "${content}")
 	string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
 	string(REPLACE "@GITWEBDIR@" "${GITWEBDIR}" content "${content}")
-	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 "@@PAGER_ENV@@" "LESS=FRX LV=-c" content "${content}")
+	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 "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}")
 	file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
 endforeach()
 
@@ -849,13 +849,13 @@  parse_makefile_for_scripts(git_perl_scripts "SCRIPT_PERL" ".perl")
 
 #create perl header
 file(STRINGS ${CMAKE_SOURCE_DIR}/perl/header_templates/fixed_prefix.template.pl perl_header )
-string(REPLACE "@@PATHSEP@@" ":" perl_header "${perl_header}")
-string(REPLACE "@@INSTLIBDIR@@" "${INSTLIBDIR}" perl_header "${perl_header}")
+string(REPLACE "@PATHSEP@" ":" perl_header "${perl_header}")
+string(REPLACE "@INSTLIBDIR@" "${INSTLIBDIR}" perl_header "${perl_header}")
 
 foreach(script ${git_perl_scripts})
 	file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.perl content NEWLINE_CONSUME)
 	string(REPLACE "#!/usr/bin/perl" "#!/usr/bin/perl\n${perl_header}\n" content "${content}")
-	string(REPLACE "@@GIT_VERSION@@" "${PROJECT_VERSION}" content "${content}")
+	string(REPLACE "@GIT_VERSION@" "${PROJECT_VERSION}" content "${content}")
 	file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
 endforeach()
 
@@ -870,8 +870,8 @@  file(GLOB_RECURSE perl_modules "${CMAKE_SOURCE_DIR}/perl/*.pm")
 foreach(pm ${perl_modules})
 	string(REPLACE "${CMAKE_SOURCE_DIR}/perl/" "" file_path ${pm})
 	file(STRINGS ${pm} content NEWLINE_CONSUME)
-	string(REPLACE "@@LOCALEDIR@@" "${LOCALEDIR}" content "${content}")
-	string(REPLACE "@@NO_PERL_CPAN_FALLBACKS@@" "" content "${content}")
+	string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
+	string(REPLACE "@NO_PERL_CPAN_FALLBACKS@" "" content "${content}")
 	file(WRITE ${CMAKE_BINARY_DIR}/perl/build/lib/${file_path} ${content})
 #test-lib.sh requires perl/build/lib to be the build directory of perl modules
 endforeach()
@@ -1079,21 +1079,21 @@  set(wrapper_test_scripts
 
 foreach(script ${wrapper_scripts})
 	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
-	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
-	string(REPLACE "@@PROG@@" "${script}${EXE_EXTENSION}" content "${content}")
+	string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
+	string(REPLACE "@PROG@" "${script}${EXE_EXTENSION}" content "${content}")
 	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
 endforeach()
 
 foreach(script ${wrapper_test_scripts})
 	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
-	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
-	string(REPLACE "@@PROG@@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
+	string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
+	string(REPLACE "@PROG@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
 	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
 endforeach()
 
 file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
-string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
-string(REPLACE "@@PROG@@" "git-cvsserver" content "${content}")
+string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}")
+string(REPLACE "@PROG@" "git-cvsserver" content "${content}")
 file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/git-cvsserver ${content})
 
 #options for configuring test options
diff --git a/generate-perl.sh b/generate-perl.sh
index b9e04d6f42..41d78da029 100755
--- a/generate-perl.sh
+++ b/generate-perl.sh
@@ -17,6 +17,6 @@  sed -e '1{' \
     -e "	r $PERL_HEADER" \
     -e '	G' \
     -e '}' \
-    -e "s/@@GIT_VERSION@@/$GIT_VERSION/g" \
+    -e "s/@GIT_VERSION@/$GIT_VERSION/g" \
     "$PERL_SCRIPT" >"$OUT"
 chmod a+x "$OUT"
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 124f598bdc..70ae7cb8e4 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -26,7 +26,7 @@ 
 use File::Basename;
 use Getopt::Long qw(:config require_order no_ignore_case);
 
-my $VERSION = '@@GIT_VERSION@@';
+my $VERSION = '@GIT_VERSION@';
 
 my $log = GITCVS::log->new();
 my $cfg;
diff --git a/git-instaweb.sh b/git-instaweb.sh
index 8dbe21d588..c8efb1205a 100755
--- a/git-instaweb.sh
+++ b/git-instaweb.sh
@@ -3,7 +3,7 @@ 
 # Copyright (c) 2006 Eric Wong
 #
 
-PERL='@@PERL@@'
+PERL='@PERL@'
 OPTIONS_KEEPDASHDASH=
 OPTIONS_STUCKLONG=
 OPTIONS_SPEC="\
@@ -38,8 +38,8 @@  conf="$GIT_DIR/gitweb/httpd.conf"
 # if installed, it doesn't need further configuration (module_path)
 test -z "$httpd" && httpd='lighttpd -f'
 
-# Default is @@GITWEBDIR@@
-test -z "$root" && root='@@GITWEBDIR@@'
+# Default is @GITWEBDIR@
+test -z "$root" && root='@GITWEBDIR@'
 
 # any untaken local port will do...
 test -z "$port" && port=1234
@@ -716,7 +716,7 @@  EOF
 
 gitweb_conf() {
 	cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
-#!@@PERL@@
+#!@PERL@
 our \$projectroot = "$(dirname "$fqgitdir")";
 our \$git_temp = "$fqgitdir/gitweb/tmp";
 our \$projects_list = \$projectroot;
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 01640a044b..10c88639e2 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -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@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
 remote_sha1=$2
 ref=$3
 
diff --git a/git-send-email.perl b/git-send-email.perl
index c835d4c11a..02805c43e5 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1501,7 +1501,7 @@  sub gen_header {
 	@recipients = unique_email_list(@recipients,@cc,@initial_bcc);
 	@recipients = (map { extract_valid_address_or_die($_) } @recipients);
 	my $date = format_2822_time($time++);
-	my $gitversion = '@@GIT_VERSION@@';
+	my $gitversion = '@GIT_VERSION@';
 	if ($gitversion =~ m/..GIT_VERSION../) {
 	    $gitversion = Git::version();
 	}
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index a15c0620db..ae4b2d6ba9 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -9,7 +9,7 @@  TEXTDOMAIN=git
 export TEXTDOMAIN
 if test -z "$GIT_TEXTDOMAINDIR"
 then
-	TEXTDOMAINDIR="@@LOCALEDIR@@"
+	TEXTDOMAINDIR="@LOCALEDIR@"
 else
 	TEXTDOMAINDIR="$GIT_TEXTDOMAINDIR"
 fi
@@ -17,9 +17,9 @@  export TEXTDOMAINDIR
 
 # First decide what scheme to use...
 GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "@@USE_GETTEXT_SCHEME@@"
+if test -n "@USE_GETTEXT_SCHEME@"
 then
-	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
+	GIT_INTERNAL_GETTEXT_SH_SCHEME="@USE_GETTEXT_SCHEME@"
 elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
 then
 	: no probing necessary
diff --git a/git-sh-setup.sh b/git-sh-setup.sh
index ce273fe0e4..19aef72ec2 100644
--- a/git-sh-setup.sh
+++ b/git-sh-setup.sh
@@ -41,7 +41,7 @@  git_broken_path_fix () {
 	esac
 }
 
-# @@BROKEN_PATH_FIX@@
+# @BROKEN_PATH_FIX@
 
 # Source git-sh-i18n for gettext support.
 . "$(git --exec-path)/git-sh-i18n"
@@ -154,7 +154,7 @@  git_pager() {
 	else
 		GIT_PAGER=cat
 	fi
-	for vardef in @@PAGER_ENV@@
+	for vardef in @PAGER_ENV@
 	do
 		var=${vardef%%=*}
 		eval ": \"\${$vardef}\" && export $var"
@@ -280,7 +280,7 @@  get_author_ident_from_commit () {
 # remove lines from $1 that are not in $2, leaving only common lines.
 create_virtual_base() {
 	sz0=$(wc -c <"$1")
-	@@DIFF@@ -u -La/"$1" -Lb/"$1" "$1" "$2" | git apply --no-add
+	@DIFF@ -u -La/"$1" -Lb/"$1" "$1" "$2" | git apply --no-add
 	sz1=$(wc -c <"$1")
 
 	# If we do not have enough common material, it is not
diff --git a/git-svn.perl b/git-svn.perl
index 01e7a70de1..dcf65cf1d1 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -9,7 +9,7 @@ 
 		$_revision $_repository
 		$_q $_authors $_authors_prog %users/;
 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
-$VERSION = '@@GIT_VERSION@@';
+$VERSION = '@GIT_VERSION@';
 
 use Carp qw/croak/;
 use File::Basename qw/dirname basename/;
diff --git a/gitk-git/po/vi.po b/gitk-git/po/vi.po
index 5967498660..184430dcde 100644
--- a/gitk-git/po/vi.po
+++ b/gitk-git/po/vi.po
@@ -5,7 +5,7 @@ 
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gitk @@GIT_VERSION@@\n"
+"Project-Id-Version: gitk @GIT_VERSION@\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-05-17 14:32+1000\n"
 "PO-Revision-Date: 2015-09-15 07:33+0700\n"
diff --git a/gitweb/Makefile b/gitweb/Makefile
index 3b68ab2d67..164c8d5375 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -79,28 +79,28 @@  GITWEB_JSLIB_FILES += static/js/blame_incremental.js
 
 
 GITWEB_REPLACE = \
-	-e 's|++GIT_VERSION++|$(GIT_VERSION)|g' \
-	-e 's|++GIT_BINDIR++|$(bindir)|g' \
-	-e 's|++GITWEB_CONFIG++|$(GITWEB_CONFIG)|g' \
-	-e 's|++GITWEB_CONFIG_SYSTEM++|$(GITWEB_CONFIG_SYSTEM)|g' \
-	-e 's|++GITWEB_CONFIG_COMMON++|$(GITWEB_CONFIG_COMMON)|g' \
-	-e 's|++GITWEB_HOME_LINK_STR++|$(GITWEB_HOME_LINK_STR)|g' \
-	-e 's|++GITWEB_SITENAME++|$(GITWEB_SITENAME)|g' \
-	-e 's|++GITWEB_PROJECTROOT++|$(GITWEB_PROJECTROOT)|g' \
-	-e 's|"++GITWEB_PROJECT_MAXDEPTH++"|$(GITWEB_PROJECT_MAXDEPTH)|g' \
-	-e 's|++GITWEB_EXPORT_OK++|$(GITWEB_EXPORT_OK)|g' \
-	-e 's|++GITWEB_STRICT_EXPORT++|$(GITWEB_STRICT_EXPORT)|g' \
-	-e 's|++GITWEB_BASE_URL++|$(GITWEB_BASE_URL)|g' \
-	-e 's|++GITWEB_LIST++|$(GITWEB_LIST)|g' \
-	-e 's|++GITWEB_HOMETEXT++|$(GITWEB_HOMETEXT)|g' \
-	-e 's|++GITWEB_CSS++|$(GITWEB_CSS)|g' \
-	-e 's|++GITWEB_LOGO++|$(GITWEB_LOGO)|g' \
-	-e 's|++GITWEB_FAVICON++|$(GITWEB_FAVICON)|g' \
-	-e 's|++GITWEB_JS++|$(GITWEB_JS)|g' \
-	-e 's|++GITWEB_SITE_HTML_HEAD_STRING++|$(GITWEB_SITE_HTML_HEAD_STRING)|g' \
-	-e 's|++GITWEB_SITE_HEADER++|$(GITWEB_SITE_HEADER)|g' \
-	-e 's|++GITWEB_SITE_FOOTER++|$(GITWEB_SITE_FOOTER)|g' \
-	-e 's|++HIGHLIGHT_BIN++|$(HIGHLIGHT_BIN)|g'
+	-e 's|@GIT_VERSION@|$(GIT_VERSION)|g' \
+	-e 's|@GIT_BINDIR@|$(bindir)|g' \
+	-e 's|@GITWEB_CONFIG@|$(GITWEB_CONFIG)|g' \
+	-e 's|@GITWEB_CONFIG_SYSTEM@|$(GITWEB_CONFIG_SYSTEM)|g' \
+	-e 's|@GITWEB_CONFIG_COMMON@|$(GITWEB_CONFIG_COMMON)|g' \
+	-e 's|@GITWEB_HOME_LINK_STR@|$(GITWEB_HOME_LINK_STR)|g' \
+	-e 's|@GITWEB_SITENAME@|$(GITWEB_SITENAME)|g' \
+	-e 's|@GITWEB_PROJECTROOT@|$(GITWEB_PROJECTROOT)|g' \
+	-e 's|"@GITWEB_PROJECT_MAXDEPTH@"|$(GITWEB_PROJECT_MAXDEPTH)|g' \
+	-e 's|@GITWEB_EXPORT_OK@|$(GITWEB_EXPORT_OK)|g' \
+	-e 's|@GITWEB_STRICT_EXPORT@|$(GITWEB_STRICT_EXPORT)|g' \
+	-e 's|@GITWEB_BASE_URL@|$(GITWEB_BASE_URL)|g' \
+	-e 's|@GITWEB_LIST@|$(GITWEB_LIST)|g' \
+	-e 's|@GITWEB_HOMETEXT@|$(GITWEB_HOMETEXT)|g' \
+	-e 's|@GITWEB_CSS@|$(GITWEB_CSS)|g' \
+	-e 's|@GITWEB_LOGO@|$(GITWEB_LOGO)|g' \
+	-e 's|@GITWEB_FAVICON@|$(GITWEB_FAVICON)|g' \
+	-e 's|@GITWEB_JS@|$(GITWEB_JS)|g' \
+	-e 's|@GITWEB_SITE_HTML_HEAD_STRING@|$(GITWEB_SITE_HTML_HEAD_STRING)|g' \
+	-e 's|@GITWEB_SITE_HEADER@|$(GITWEB_SITE_HEADER)|g' \
+	-e 's|@GITWEB_SITE_FOOTER@|$(GITWEB_SITE_FOOTER)|g' \
+	-e 's|@HIGHLIGHT_BIN@|$(HIGHLIGHT_BIN)|g'
 
 .PHONY: FORCE
 $(MAK_DIR_GITWEB)GITWEB-BUILD-OPTIONS: FORCE
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index b09a8d0523..76e1f4e244 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -35,7 +35,7 @@  BEGIN
 	CGI->compile() if $ENV{'MOD_PERL'};
 }
 
-our $version = "++GIT_VERSION++";
+our $version = "@GIT_VERSION@";
 
 our ($my_url, $my_uri, $base_url, $path_info, $home_link);
 sub evaluate_uri {
@@ -80,46 +80,46 @@  sub evaluate_uri {
 
 # core git executable to use
 # this can just be "git" if your webserver has a sensible PATH
-our $GIT = "++GIT_BINDIR++/git";
+our $GIT = "@GIT_BINDIR@/git";
 
 # absolute fs-path which will be prepended to the project path
 #our $projectroot = "/pub/scm";
-our $projectroot = "++GITWEB_PROJECTROOT++";
+our $projectroot = "@GITWEB_PROJECTROOT@";
 
 # fs traversing limit for getting project list
 # the number is relative to the projectroot
-our $project_maxdepth = "++GITWEB_PROJECT_MAXDEPTH++";
+our $project_maxdepth = "@GITWEB_PROJECT_MAXDEPTH@";
 
 # string of the home link on top of all pages
-our $home_link_str = "++GITWEB_HOME_LINK_STR++";
+our $home_link_str = "@GITWEB_HOME_LINK_STR@";
 
 # extra breadcrumbs preceding the home link
 our @extra_breadcrumbs = ();
 
 # name of your site or organization to appear in page titles
 # replace this with something more descriptive for clearer bookmarks
-our $site_name = "++GITWEB_SITENAME++"
+our $site_name = "@GITWEB_SITENAME@"
                  || ($ENV{'SERVER_NAME'} || "Untitled") . " Git";
 
 # html snippet to include in the <head> section of each page
-our $site_html_head_string = "++GITWEB_SITE_HTML_HEAD_STRING++";
+our $site_html_head_string = "@GITWEB_SITE_HTML_HEAD_STRING@";
 # filename of html text to include at top of each page
-our $site_header = "++GITWEB_SITE_HEADER++";
+our $site_header = "@GITWEB_SITE_HEADER@";
 # html text to include at home page
-our $home_text = "++GITWEB_HOMETEXT++";
+our $home_text = "@GITWEB_HOMETEXT@";
 # filename of html text to include at bottom of each page
-our $site_footer = "++GITWEB_SITE_FOOTER++";
+our $site_footer = "@GITWEB_SITE_FOOTER@";
 
 # URI of stylesheets
-our @stylesheets = ("++GITWEB_CSS++");
+our @stylesheets = ("@GITWEB_CSS@");
 # URI of a single stylesheet, which can be overridden in GITWEB_CONFIG.
 our $stylesheet = undef;
 # URI of GIT logo (72x27 size)
-our $logo = "++GITWEB_LOGO++";
+our $logo = "@GITWEB_LOGO@";
 # URI of GIT favicon, assumed to be image/png type
-our $favicon = "++GITWEB_FAVICON++";
+our $favicon = "@GITWEB_FAVICON@";
 # URI of gitweb.js (JavaScript code for gitweb)
-our $javascript = "++GITWEB_JS++";
+our $javascript = "@GITWEB_JS@";
 
 # URI and label (title) of GIT logo link
 #our $logo_url = "https://www.kernel.org/pub/software/scm/git/docs/";
@@ -128,7 +128,7 @@  sub evaluate_uri {
 our $logo_label = "git homepage";
 
 # source of projects list
-our $projects_list = "++GITWEB_LIST++";
+our $projects_list = "@GITWEB_LIST@";
 
 # the width (in characters) of the projects list "Description" column
 our $projects_list_description_width = 25;
@@ -147,7 +147,7 @@  sub evaluate_uri {
 
 # show repository only if this file exists
 # (only effective if this variable evaluates to true)
-our $export_ok = "++GITWEB_EXPORT_OK++";
+our $export_ok = "@GITWEB_EXPORT_OK@";
 
 # don't generate age column on the projects list page
 our $omit_age_column = 0;
@@ -161,11 +161,11 @@  sub evaluate_uri {
 our $export_auth_hook = undef;
 
 # only allow viewing of repositories also shown on the overview page
-our $strict_export = "++GITWEB_STRICT_EXPORT++";
+our $strict_export = "@GITWEB_STRICT_EXPORT@";
 
 # list of git base URLs used for URL to where fetch project from,
 # i.e. full URL is "$git_base_url/$project"
-our @git_base_url_list = grep { $_ ne '' } ("++GITWEB_BASE_URL++");
+our @git_base_url_list = grep { $_ ne '' } ("@GITWEB_BASE_URL@");
 
 # default blob_plain mimetype and default charset for text/plain blob
 our $default_blob_plain_mimetype = 'text/plain';
@@ -200,7 +200,7 @@  sub evaluate_uri {
 # http://andre-simon.de/zip/download.php due to assumptions about parameters and output).
 # Useful if highlight is not installed on your webserver's PATH.
 # [Default: highlight]
-our $highlight_bin = "++HIGHLIGHT_BIN++";
+our $highlight_bin = "@HIGHLIGHT_BIN@";
 
 # information about snapshot formats that gitweb is capable of serving
 our %known_snapshot_formats = (
@@ -741,9 +741,9 @@  sub read_config_file {
 
 our ($GITWEB_CONFIG, $GITWEB_CONFIG_SYSTEM, $GITWEB_CONFIG_COMMON);
 sub evaluate_gitweb_config {
-	our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "++GITWEB_CONFIG++";
-	our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "++GITWEB_CONFIG_SYSTEM++";
-	our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "++GITWEB_CONFIG_COMMON++";
+	our $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || "@GITWEB_CONFIG@";
+	our $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || "@GITWEB_CONFIG_SYSTEM@";
+	our $GITWEB_CONFIG_COMMON = $ENV{'GITWEB_CONFIG_COMMON'} || "@GITWEB_CONFIG_COMMON@";
 
 	# Protect against duplications of file names, to not read config twice.
 	# Only one of $GITWEB_CONFIG and $GITWEB_CONFIG_SYSTEM is used, so
diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index 5454c3a6d2..1da830c98a 100644
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -20,14 +20,14 @@  BEGIN
 # this "'@@' [...] '@@'" pattern.
 use constant NO_GETTEXT_STR => '@@' . 'NO_GETTEXT' . '@@';
 use constant NO_GETTEXT => (
-	q[@@NO_GETTEXT@@] ne ''
+	q[@NO_GETTEXT@] ne ''
 	and
-	q[@@NO_GETTEXT@@] ne NO_GETTEXT_STR
+	q[@NO_GETTEXT@] ne NO_GETTEXT_STR
 );
 
 sub __bootstrap_locale_messages {
 	our $TEXTDOMAIN = 'git';
-	our $TEXTDOMAINDIR ||= $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@';
+	our $TEXTDOMAINDIR ||= $ENV{GIT_TEXTDOMAINDIR} || '@LOCALEDIR@';
 	die "NO_GETTEXT=" . NO_GETTEXT_STR if NO_GETTEXT;
 
 	require POSIX;
diff --git a/perl/Git/LoadCPAN.pm b/perl/Git/LoadCPAN.pm
index 8c7fa805f9..6be99840f8 100644
--- a/perl/Git/LoadCPAN.pm
+++ b/perl/Git/LoadCPAN.pm
@@ -31,11 +31,11 @@  =head1 DESCRIPTION
 # Makefile, and allows for detecting whether the module is loaded from
 # perl/Git as opposed to perl/build/Git, which is useful for one-off
 # testing without having Error.pm et al installed.
-use constant NO_PERL_CPAN_FALLBACKS_STR => '@@' . 'NO_PERL_CPAN_FALLBACKS' . '@@';
+use constant NO_PERL_CPAN_FALLBACKS_STR => '@' . 'NO_PERL_CPAN_FALLBACKS' . '@';
 use constant NO_PERL_CPAN_FALLBACKS => (
-	q[@@NO_PERL_CPAN_FALLBACKS@@] ne ''
+	q[@NO_PERL_CPAN_FALLBACKS@] ne ''
 	and
-	q[@@NO_PERL_CPAN_FALLBACKS@@] ne NO_PERL_CPAN_FALLBACKS_STR
+	q[@NO_PERL_CPAN_FALLBACKS@] ne NO_PERL_CPAN_FALLBACKS_STR
 );
 
 sub import {
diff --git a/perl/header_templates/fixed_prefix.template.pl b/perl/header_templates/fixed_prefix.template.pl
index 857b4391a4..d571ca5cde 100644
--- a/perl/header_templates/fixed_prefix.template.pl
+++ b/perl/header_templates/fixed_prefix.template.pl
@@ -1 +1 @@ 
-use lib (split(/@@PATHSEP@@/, $ENV{GITPERLLIB} || '@@INSTLIBDIR@@'));
+use lib (split(/@PATHSEP@/, $ENV{GITPERLLIB} || '@INSTLIBDIR@'));
diff --git a/perl/header_templates/runtime_prefix.template.pl b/perl/header_templates/runtime_prefix.template.pl
index 9d28b3d863..e6f8e661a1 100644
--- a/perl/header_templates/runtime_prefix.template.pl
+++ b/perl/header_templates/runtime_prefix.template.pl
@@ -3,7 +3,7 @@ 
 # This finds our Git::* libraries relative to the script's runtime path.
 sub __git_system_path {
 	my ($relpath) = @_;
-	my $gitexecdir_relative = '@@GITEXECDIR_REL@@';
+	my $gitexecdir_relative = '@GITEXECDIR_REL@';
 
 	# GIT_EXEC_PATH is supplied by `git` or the test suite.
 	my $exec_path;
@@ -24,11 +24,11 @@  sub __git_system_path {
 }
 
 BEGIN {
-	use lib split /@@PATHSEP@@/,
+	use lib split /@PATHSEP@/,
 	(
 		$ENV{GITPERLLIB} ||
 		do {
-			my $perllibdir = __git_system_path('@@PERLLIBDIR_REL@@');
+			my $perllibdir = __git_system_path('@PERLLIBDIR_REL@');
 			(-e $perllibdir) || die("Invalid system path ($relpath): $path");
 			$perllibdir;
 		}
@@ -36,7 +36,7 @@  BEGIN
 
 	# Export the system locale directory to the I18N module. The locale directory
 	# is only installed if NO_GETTEXT is set.
-	$Git::I18N::TEXTDOMAINDIR = __git_system_path('@@LOCALEDIR_REL@@');
+	$Git::I18N::TEXTDOMAINDIR = __git_system_path('@LOCALEDIR_REL@');
 }
 
 # END RUNTIME_PREFIX generated code.
diff --git a/unimplemented.sh b/unimplemented.sh
index fee21d24e8..41776b279d 100644
--- a/unimplemented.sh
+++ b/unimplemented.sh
@@ -1,4 +1,4 @@ 
 #!/bin/sh
 
-echo >&2 "fatal: git was built without support for $(basename $0) (@@REASON@@)."
+echo >&2 "fatal: git was built without support for $(basename $0) (@REASON@)."
 exit 128
diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh
index 95851b85b6..7898a1c238 100644
--- a/wrap-for-bin.sh
+++ b/wrap-for-bin.sh
@@ -4,33 +4,33 @@ 
 # to run test suite against sandbox, but with only bindir-installed
 # executables in PATH.  The Makefile copies this into various
 # files in bin-wrappers, substituting
-# @@BUILD_DIR@@ and @@PROG@@.
+# @BUILD_DIR@ and @PROG@.
 
-GIT_EXEC_PATH='@@BUILD_DIR@@'
+GIT_EXEC_PATH='@BUILD_DIR@'
 if test -n "$NO_SET_GIT_TEMPLATE_DIR"
 then
 	unset GIT_TEMPLATE_DIR
 else
-	GIT_TEMPLATE_DIR='@@BUILD_DIR@@/templates/blt'
+	GIT_TEMPLATE_DIR='@BUILD_DIR@/templates/blt'
 	export GIT_TEMPLATE_DIR
 fi
-GITPERLLIB='@@BUILD_DIR@@/perl/build/lib'"${GITPERLLIB:+:$GITPERLLIB}"
-GIT_TEXTDOMAINDIR='@@BUILD_DIR@@/po/build/locale'
-PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH"
+GITPERLLIB='@BUILD_DIR@/perl/build/lib'"${GITPERLLIB:+:$GITPERLLIB}"
+GIT_TEXTDOMAINDIR='@BUILD_DIR@/po/build/locale'
+PATH='@BUILD_DIR@/bin-wrappers:'"$PATH"
 
 export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR
 
 case "$GIT_DEBUGGER" in
 '')
-	exec "${GIT_EXEC_PATH}/@@PROG@@" "$@"
+	exec "${GIT_EXEC_PATH}/@PROG@" "$@"
 	;;
 1)
 	unset GIT_DEBUGGER
-	exec gdb --args "${GIT_EXEC_PATH}/@@PROG@@" "$@"
+	exec gdb --args "${GIT_EXEC_PATH}/@PROG@" "$@"
 	;;
 *)
 	GIT_DEBUGGER_ARGS="$GIT_DEBUGGER"
 	unset GIT_DEBUGGER
-	exec ${GIT_DEBUGGER_ARGS} "${GIT_EXEC_PATH}/@@PROG@@" "$@"
+	exec ${GIT_DEBUGGER_ARGS} "${GIT_EXEC_PATH}/@PROG@" "$@"
 	;;
 esac