diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-25 20:56:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-25 20:56:36 (GMT) |
| commit | d9d9e6ee6366fed93a4beff3994bad376f81eabd (patch) | |
| tree | bd666fa15e440aaa1d12e2092489cd20770111f8 /Makefile | |
| parent | c921cc92e5ff2ead4dea112b19e555f521cf20b8 (diff) | |
| parent | bfce5087ee01fdead5cdc52180c8eef22adbbd71 (diff) | |
| download | git-d9d9e6ee6366fed93a4beff3994bad376f81eabd.zip git-d9d9e6ee6366fed93a4beff3994bad376f81eabd.tar.gz git-d9d9e6ee6366fed93a4beff3994bad376f81eabd.tar.bz2 | |
Merge branch 'maint'
* maint:
Makefile: fix shell quoting
tests: propagate $(TAR) down from the toplevel Makefile
index-pack.c: correctly initialize appended objects
send-email: find body-encoding correctly
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1255,8 +1255,12 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS echo "$$FLAGS" >GIT-CFLAGS; \ fi +# We need to apply sq twice, once to protect from the shell +# that runs GIT-BUILD-OPTIONS, and then again to protect it +# and the first level quoting from the shell that runs "echo". GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS - @echo SHELL_PATH=\''$(SHELL_PATH_SQ)'\' >$@ + @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@ + @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@ ### Detect Tck/Tk interpreter path changes ifndef NO_TCLTK |