summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 15:04:50 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 15:04:50 -0300
commit6f9aa9413aac5a24f2e03dc48b2ff3db0ccafc92 (patch)
tree02172a25eeee331f91f11fc91a8e855ada74ade9 /v4l
parent59a57f6b9ea53f0ff73ec4eafbab23f2dea7221e (diff)
parent42b611c065802d5d31f3fd7629bc10e2b134c661 (diff)
downloadmediapointer-dvb-s2-6f9aa9413aac5a24f2e03dc48b2ff3db0ccafc92.tar.gz
mediapointer-dvb-s2-6f9aa9413aac5a24f2e03dc48b2ff3db0ccafc92.tar.bz2
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-dev
From: Mauro Carvalho Chehab <mchehab@infradead.org> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l')
-rw-r--r--v4l/Makefile2
-rw-r--r--v4l/firmware/Makefile6
2 files changed, 4 insertions, 4 deletions
diff --git a/v4l/Makefile b/v4l/Makefile
index 04e74e8e5..2aa856974 100644
--- a/v4l/Makefile
+++ b/v4l/Makefile
@@ -117,7 +117,7 @@ EXTRA_CFLAGS += $(if $(wildcard $(srctree)/.mm), -DMM_KERNEL)
EXTRA_CFLAGS += -include $(obj)/config-compat.h
# Allow kernel version compat tests without adding #include's
-EXTRA_CFLAGS += -include linux/version.h
+EXTRA_CFLAGS += -include include/linux/version.h
#################################################
# Kernel 2.4/2.6 specific rules
diff --git a/v4l/firmware/Makefile b/v4l/firmware/Makefile
index e018ad92a..a1717922d 100644
--- a/v4l/firmware/Makefile
+++ b/v4l/firmware/Makefile
@@ -7,13 +7,13 @@ TARGETS = ihex2fw vicam/firmware.fw dabusb/firmware.fw dabusb/bitstream.bin ttus
default: $(TARGETS)
clean:
- -rm $(TARGETS)
+ @for i in $(TARGETS); do if [ -e $$i ]; then rm $$i; fi; done
distclean: clean
- -rmdir $(DIRS)
+ @for i in $(DIR); do if [ -d $$i ]; then rmdir $$i; fi; done
install: default
- -for i in $(DIRS); do mkdir /lib/firmware/$$i; done
+ -for i in $(DIRS); do if mkdir /lib/firmware/$$i; done
-for i in $(TARGETS); do cp $$i /lib/firmware/$$i; done