diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:42 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 06:02:42 -0700 |
commit | 919e06b2288270f47c55759e8810b87f74609caf (patch) | |
tree | 2fe295a61f1d61e56db0626ec33131375c2152f8 /Makefile | |
parent | a031d76eebbe85c93f5d4a2a4cafacf417df9bce (diff) | |
parent | 23b093ee087e99049585487f59e262a0e0662b6e (diff) | |
download | git-919e06b2288270f47c55759e8810b87f74609caf.tar.gz git-919e06b2288270f47c55759e8810b87f74609caf.tar.xz |
Merge branch 'bc/portable'
* bc/portable:
Remove python 2.5'isms
Makefile: add PYTHON_PATH to GIT-BUILD-OPTIONS
t/aggregate-results: accomodate systems with small max argument list length
t/t7006: ignore return status of shell's unset builtin
t/t5150: remove space from sed script
git-request-pull.sh: remove -e switch to shell interpreter which breaks ksh
t/t5800: skip if python version is older than 2.5
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1884,6 +1884,7 @@ GIT-CFLAGS: FORCE GIT-BUILD-OPTIONS: FORCE @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@ @echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@ + @echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@ @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@ @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@ @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@ |