summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index fdccb41c0..1c9de084a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,14 +19,18 @@ install:
$(MAKE) -C $(BUILD_DIR) $(MAKECMDGOALS)
commit cvscommit hgcommit change changes changelog:: whitespace
- cd $(BUILD_DIR); scripts/cardlist; cd ..
- v4l/scripts/prep_commit_msg.pl $(TMP)/v4l_hg_whitespace > \
+ @cd $(BUILD_DIR); scripts/cardlist; cd ..
+ @v4l/scripts/prep_commit_msg.pl $(TMP)/v4l_hg_whitespace > \
$(TMP)/v4l_hg_commit.msg
- $(EDITOR) $(TMP)/v4l_hg_commit.msg
+ @CHECKSUM=`md5sum "$(TMP)/v4l_hg_commit.msg"`; \
+ $(EDITOR) $(TMP)/v4l_hg_commit.msg || exit $?; \
+ echo "$$CHECKSUM" | md5sum -c --status && \
+ echo "*** commit message not changed. Aborting. ***" \
+ && exit 13 || exit 0
grep -v '^#' $(TMP)/v4l_hg_commit.msg | hg commit -l -
@echo "*** PLEASE CHECK IF LOG IS OK:"
@hg log -v -r -1
- @echo "*** If not ok, do hg undo and make commit again"
+ @echo "*** If not ok, do \"hg rollback\" and \"make commit\" again"
qrefresh:: whitespace
cd $(BUILD_DIR); scripts/cardlist; cd ..
@@ -43,7 +47,7 @@ push::
@echo "Pushing changes to master repository"
-hg push
-whitespace:
+whitespace whitespaces:
@echo "Cleaning bad whitespaces"
@v4l/scripts/strip-trailing-whitespaces.sh fast | \
tee $(TMP)/v4l_hg_whitespace | patch -p0