From 5544436dfdaf40b96906241f31f3fb97880440a2 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Thu, 16 Feb 2006 17:39:19 -0500 Subject: make ivtv: virtual tree merge From: Michael Krufky - 'make ivtv' will retreive the latest sources from ivtv svn trunk - 'make' will build the entire v4l-dvb tree including ivtv - 'make' (without previously running 'make ivtv') will build using previous behavior. Signed-off-by: Michael Krufky --- v4l/scripts/merge-pvrusb2.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'v4l/scripts') diff --git a/v4l/scripts/merge-pvrusb2.sh b/v4l/scripts/merge-pvrusb2.sh index e12d79a3f..a43ba32a4 100755 --- a/v4l/scripts/merge-pvrusb2.sh +++ b/v4l/scripts/merge-pvrusb2.sh @@ -38,8 +38,8 @@ patch -p1 <<'DIFF' -# patch -R -p1 < scripts/merge-pvrusb2.sh + patch -R -p1 < scripts/merge-pvrusb2.sh - links:: - @echo creating symbolic links... + ivtv-checkout:: + @if [ ! -d ivtv ]; then \ @@ -464,7 +467,7 @@ dvb-rminstall:: rmmodules:: rmmod -w $(shell echo "$(v4l_modules)"|sed s,' ','\n',g|sed s,'-','_',g|sort|uniq -d) -- cgit v1.2.3