diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-03 15:17:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-03 15:17:11 -0700 |
| commit | 7b6e6b3fb25db0e80ec331ed0a1eb8eb9edc2c84 (patch) | |
| tree | 32a84d7292d143a283600334371a3cb30626b7b7 | |
| parent | e9aa24123d0ff8914a34a9f40f23bf736ec2bfb7 (diff) | |
| parent | 755a605d6eef787af0e7310fa968cc62749294a6 (diff) | |
| download | git-7b6e6b3fb25db0e80ec331ed0a1eb8eb9edc2c84.tar.gz git-7b6e6b3fb25db0e80ec331ed0a1eb8eb9edc2c84.tar.xz | |
Merge branch 'rr/svn-fe' into maint
* rr/svn-fe:
contrib/svn-fe: Add the svn-fe target to .gitignore
contrib/svn-fe: Fix IncludePath
| -rw-r--r-- | contrib/svn-fe/.gitignore | 1 | ||||
| -rw-r--r-- | contrib/svn-fe/Makefile | 2 | ||||
| -rw-r--r-- | contrib/svn-fe/svn-fe.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/contrib/svn-fe/.gitignore b/contrib/svn-fe/.gitignore index 27a33b669..02a779158 100644 --- a/contrib/svn-fe/.gitignore +++ b/contrib/svn-fe/.gitignore @@ -1,3 +1,4 @@ /*.xml /*.1 /*.html +/svn-fe diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile index 4cc8d1582..360d8da41 100644 --- a/contrib/svn-fe/Makefile +++ b/contrib/svn-fe/Makefile @@ -38,7 +38,7 @@ svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(GIT_LIB) $(ALL_LDFLAGS) $(LIBS) svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h - $(QUIET_CC)$(CC) -o $*.o -c $(ALL_CFLAGS) $< + $(QUIET_CC)$(CC) -I../../vcs-svn -o $*.o -c $(ALL_CFLAGS) $< svn-fe.html: svn-fe.txt $(QUIET_SUBDIR0)../../Documentation $(QUIET_SUBDIR1) \ diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c index 43c4320ca..e9b9ba4da 100644 --- a/contrib/svn-fe/svn-fe.c +++ b/contrib/svn-fe/svn-fe.c @@ -4,7 +4,7 @@ */ #include <stdlib.h> -#include "vcs-svn/svndump.h" +#include "svndump.h" int main(int argc, char **argv) { |