summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-06-22 18:53:32 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-22 18:53:32 -0300
commit9df36810bbaf04dd571229e65992eb1df2b36f83 (patch)
tree4d84cf17ed9ba4e8a4350df6e75b1c1b6147d6a8 /Makefile
parent498a9414b7297324bcf449471e2962250bc507e4 (diff)
parentb00987276ad2c4bef7891591a6ca2081a7d1e1d4 (diff)
downloadmediapointer-dvb-s2-9df36810bbaf04dd571229e65992eb1df2b36f83.tar.gz
mediapointer-dvb-s2-9df36810bbaf04dd571229e65992eb1df2b36f83.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 42c22f72a..9d6f7c3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
BUILD_DIR := $(shell pwd)/v4l
+TMP ?= /tmp
REPO_PULL := http://linuxtv.org/hg/v4l-dvb
ifeq ($(REPO_PUSH),)
ifneq ($(CHANGE_LOG_LOGIN),)
@@ -26,9 +27,10 @@ install:
commit cvscommit hgcommit change changes changelog:: whitespace
cd $(BUILD_DIR); scripts/cardlist; cd ..
- v4l/scripts/prep_commit_msg.pl >/tmp/v4l_hg_commit.msg
- $(EDITOR) /tmp/v4l_hg_commit.msg
- grep -v ^# /tmp/v4l_hg_commit.msg | hg commit -l -
+ v4l/scripts/prep_commit_msg.pl $(TMP)/v4l_hg_whitespace > \
+ $(TMP)/v4l_hg_commit.msg
+ $(EDITOR) $(TMP)/v4l_hg_commit.msg
+ 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"
@@ -43,5 +45,5 @@ push::
whitespace:
@echo "Cleaning bad whitespaces"
- @v4l/scripts/strip-trailing-whitespaces.sh fast | patch -p0
-
+ @v4l/scripts/strip-trailing-whitespaces.sh fast | \
+ tee $(TMP)/v4l_hg_whitespace | patch -p0