Merge branch 'rr/svn-fe' into maint

gitster · gitster · commit 7b6e6b3fb25d · 2010-08-03T15:17:11.000-07:00
* rr/svn-fe:
  contrib/svn-fe: Add the svn-fe target to .gitignore
  contrib/svn-fe: Fix IncludePath
diff --git 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
@@ -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
@@ -4,7 +4,7 @@
  */
 
 #include <stdlib.h>
-#include "vcs-svn/svndump.h"
+#include "svndump.h"
 
 int main(int argc, char **argv)
 {

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 /*.xml
 /*.1
 /*.html
 +/svn-fe