diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2006-02-16 17:39:19 -0500 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2006-02-16 17:39:19 -0500 |
| commit | 5544436dfdaf40b96906241f31f3fb97880440a2 (patch) | |
| tree | f8281994566c3a755591ce23a5cbcce4086b69d1 /v4l/scripts | |
| parent | ba6fd62e300890669a26aa75573c7ca48cd7ff3b (diff) | |
| download | mediapointer-dvb-s2-5544436dfdaf40b96906241f31f3fb97880440a2.tar.gz mediapointer-dvb-s2-5544436dfdaf40b96906241f31f3fb97880440a2.tar.bz2 | |
make ivtv: virtual tree merge
From: Michael Krufky <mkrufky@linuxtv.org>
- '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 <mkrufky@linuxtv.org>
Diffstat (limited to 'v4l/scripts')
| -rwxr-xr-x | v4l/scripts/merge-pvrusb2.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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) |