ba58dfdc4976da495a35f9a7a0d609de5bc1b1b4 galt Fri Jun 11 23:41:32 2010 -0700 first quick attempt to change major makefiles from cvs to git. diff --git src/makefile src/makefile index 7cdee32..2d0a597 100644 --- src/makefile +++ src/makefile @@ -7,9 +7,10 @@ beta: check-beta clean cgi-beta -# do a cvs update and clean +# do a git update and clean update: - cvs update -d -P + git pull origin master + git checkout master ${MAKE} clean topLibs: @@ -35,7 +36,7 @@ check-beta: # this will fail if we are not in a beta checkout: - cvs status makefile | egrep 'v[0-9]+_branch' > /dev/null + git branch | egrep 'v[0-9]+_branch' > /dev/null blatSuite: topLibs cd blat && ${MAKE}