global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-31 20:10:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gv/portable' into next

Browse Source 
* gv/portable:
  test-lib: use DIFF definition from GIT-BUILD-OPTIONS
This commit is contained in:
Junio C Hamano
2010-06-13 11:23:44 -07:00
parent 6d1fdd6097 5e87eae97d
commit 1add99cd9c
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -1955,6 +1955,12 @@ GIT-BUILD-OPTIONS: FORCE
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
ifdef GIT_TEST_CMP
@echo GIT_TEST_CMP=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_CMP)))'\' >>$@
endif
ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
@echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@
endif
### Detect Tck/Tk interpreter path changes
ifndef NO_TCLTK