janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 07:00:39 +01:00
Code Activity

rules.mk: Make update ignored conflicts found, hopefully fixed that

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-07-09 08:31:22 +00:00
commit 78c02625a0
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
make/rules.mk
View file

@ -97,10 +97,10 @@ love:
@echo "Not war?" @echo "Not war?"
cvsupdate update: cvsupdate update:
if [ -d "CVS" ]; then cvs update -dP; else git pull; fi if [ -d "CVS" ]; then cvs update -dP || exit 1; else git pull || exit 1; fi
cvsdiff diff: cvsdiff diff:
if [ -d "CVS" ]; then cvs diff -dP; else git --no-pager diff; fi if [ -d "CVS" ]; then cvs diff -dP || exit 1; else git --no-pager diff || exit 1; fi
prepend_header: prepend_header:
set -e; for f in $(SRC_UNHEADERED); do sh $(TOPDIR)/hdr/prepend_header.sh $$f; done set -e; for f in $(SRC_UNHEADERED); do sh $(TOPDIR)/hdr/prepend_header.sh $$f; done