summaryrefslogtreecommitdiff
path: root/v4l
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:40:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:40:09 -0300
commit3308516a2fe5ca58a64f65fe813de98f3637d653 (patch)
tree0974c897287c884849110e16586c0f34d8f47957 /v4l
parenta9bf92eb33a4ad79b8093c90379fb9d7519f1c88 (diff)
parente17ae483fc1526567d78cf551747362614aaae95 (diff)
downloadmediapointer-dvb-s2-3308516a2fe5ca58a64f65fe813de98f3637d653.tar.gz
mediapointer-dvb-s2-3308516a2fe5ca58a64f65fe813de98f3637d653.tar.bz2
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> 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