From 99a1c4eefe8e5d8259545a9738c343719aaa65f4 Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Sat, 28 Mar 2009 18:25:35 -0700 Subject: build: Fix kernel output directory support From: Trent Piepho 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 --- v4l/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'v4l/Makefile') 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);' \ -- cgit v1.2.3