diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:49:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-29 05:49:03 -0300 |
| commit | 9df29ed573b1ae07c6a3cbf4fdbdbbf66c2d3172 (patch) | |
| tree | c0e3f65bde5ea75d2910a7dd2beb9a131ec49f80 /v4l | |
| parent | 941ed87d34bcef83a8a1854d701aab846ba9e7a1 (diff) | |
| parent | d52037715e9e029fa316efb4a5a445c339b170cb (diff) | |
| download | mediapointer-dvb-s2-9df29ed573b1ae07c6a3cbf4fdbdbbf66c2d3172.tar.gz mediapointer-dvb-s2-9df29ed573b1ae07c6a3cbf4fdbdbbf66c2d3172.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l')
| -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);' \ |