diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-17 02:59:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-17 02:59:46 -0700 |
| commit | fa09339509e5c4c080b137d848c54a5bb21a13f8 (patch) | |
| tree | 3f2acb57ee83d5836201a89fb73abe4838e7d5f7 /Makefile | |
| parent | Merge branch 'master' into next (diff) | |
| parent | builtin-grep: workaround for non GNU grep. (diff) | |
| download | tgif-fa09339509e5c4c080b137d848c54a5bb21a13f8.tar.xz | |
Merge branch 'jc/grep' into next
* jc/grep:
builtin-grep: workaround for non GNU grep.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -46,6 +46,8 @@ all: # # Define NO_MMAP if you want to avoid mmap. # +# Define NO_H_OPTION_IN_GREP if your grep does not understand -H. +# # Define WITH_OWN_SUBPROCESS_PY if you want to use with python 2.3. # # Define NO_IPV6 if you lack IPv6 support and getaddrinfo(). @@ -444,6 +446,12 @@ ifdef NO_ACCURATE_DIFF ALL_CFLAGS += -DNO_ACCURATE_DIFF endif +ifdef NO_H_OPTION_IN_GREP + NO_H_OPTION_IN_GREP=1 +else + NO_H_OPTION_IN_GREP=0 +endif + # Shell quote (do not use $(call) to accomodate ancient setups); SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER)) @@ -526,6 +534,9 @@ git$X git.spec \ %.o: %.S $(CC) -o $*.o -c $(ALL_CFLAGS) $< +builtin-grep.o: builtin-grep.c + $(CC) -o $*.o -c $(ALL_CFLAGS) -DNO_H_OPTION_IN_GREP=$(NO_H_OPTION_IN_GREP) $< + exec_cmd.o: exec_cmd.c $(CC) -o $*.o -c $(ALL_CFLAGS) '-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' $< |