diff --git a/makefile b/makefile index cea2e3a..b81c78a 100644 --- a/makefile +++ b/makefile @@ -126,8 +126,7 @@ @printf "%s\n%s\n\n" ${HEADER1} ${HEADER2} | cat - $@ >${TMPFILE} @mv ${TMPFILE} $@ @emacs -nw $@ - -@git add $@ - -@git commit -m${HEADER1} $@ + @git add $@ docs: ${DOCS} ${PROGDOCS} ${SUPPORT} @chmod 644 ${DOCS} ${PROGDOCS} @@ -137,8 +136,11 @@ @sed -i "s/^GITID.*/GITID = \'$(shell git log --pretty=format:"%h%x20%an%x20%ad\'" | head -n1)/" ${PROGNAME}.py @sed -i "s/^VERSION.*/VERSION = \'${VERSION}'/" ${PROGNAME}.py @sed -i "s/Id:.*/Id: \'$(shell git log --pretty=format:"%h%x20%an%x20%ad\'" | head -n1)/" ${PROGNAME}.rst + @git add ${PROGNAME}.py ${PROGNAME}.rst -release: fixrev docs ${PROGFILES} +release: docs fixrev ${PROGFILES} + @git commit -m${HEADER1} + @git push @mkdir -p ${DIR}/Docs -@mkdir -p ${RELEASES} 2>&1 >/dev/null @cp -pv ${DOCS} ${PROGDOCS} ${DIR}/Docs @@ -146,7 +148,7 @@ @tar -czvf ${TARBALL} --exclude CVS ${DIR} @rm -rf ${DIR} @mv ${DIR}.tar.gz ${RELEASES} - @git checkout ${PROGMAIN} + ##### # Housekeeping