diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2009-03-28 18:25:35 -0700 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2009-03-28 18:25:35 -0700 |
| commit | 99a1c4eefe8e5d8259545a9738c343719aaa65f4 (patch) | |
| tree | 8f17ed71f5799fae24d93d4b3ec41355318ec4f6 | |
| parent | 2cc0abb17583ba0769357943dee38920a8cd757e (diff) | |
| download | mediapointer-dvb-s2-99a1c4eefe8e5d8259545a9738c343719aaa65f4.tar.gz mediapointer-dvb-s2-99a1c4eefe8e5d8259545a9738c343719aaa65f4.tar.bz2 | |
build: Fix kernel output directory support
From: Trent Piepho <xyzzy@speakeasy.org>
In patch kernel commit v2.6.24-2223-g1d3b3bf the format of the Makefile
placed in a kernel build output directory (i.e., when O=... is used) was
changed. The script in the v4l-dvb build system couldn't parse the new
format and find the kernel source directory. This fixes it so it can.
Priority: normal
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
| -rw-r--r-- | v4l/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/v4l/Makefile b/v4l/Makefile index 9d194178f..a5201f31b 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -240,7 +240,8 @@ ifneq ($(DIR),) -e ' elsif (/^PATCHLEVEL\s*=\s*(\d+)/){ $$level=$$1; }' \ -e ' elsif (/^SUBLEVEL\s*=\s*(\d+)/){ $$sublevel=$$1; }' \ -e ' elsif (/^EXTRAVERSION\s*=\s*(\S+)\n/){ $$extra=$$1; }' \ - -e ' elsif (/^KERNELSRC\s*:=\s*(\S.*)\n/){ $$o=$$d; $$d=$$1; goto S; }' \ + -e ' elsif (/^KERNELSRC\s*:=\s*(\S.*)\n/ || /^MAKEARGS\s*:=\s*-C\s*(\S.*)\n/)' \ + -e ' { $$o=$$d; $$d=$$1; goto S; }' \ -e '};' \ -e 'printf ("VERSION=%s\nPATCHLEVEL:=%s\nSUBLEVEL:=%s\nKERNELRELEASE:=%s.%s.%s%s\n",' \ -e ' $$version,$$level,$$sublevel,$$version,$$level,$$sublevel,$$extra);' \ |