dvb/linuxtv-dvb/debian/patches 10_Makefile_fix.dpatch

[Thomas Schmidt]

Update of /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb/debian/patches
In directory haydn:/tmp/cvs-serv4151/dvb/linuxtv-dvb/debian/patches

Modified Files:
	10_Makefile_fix.dpatch 
Log Message:
dvb-driver should now build with kernel-headers-debs too, without a real kernel-source-dir (missing Rules.make ...)

Index: 10_Makefile_fix.dpatch
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/dvb/linuxtv-dvb/debian/patches/10_Makefile_fix.dpatch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 10_Makefile_fix.dpatch	30 May 2004 18:44:49 -0000	1.3
+++ 10_Makefile_fix.dpatch	30 May 2004 22:14:39 -0000	1.4
@@ -24,32 +24,45 @@
 
 @DPATCH@
 diff -urNad /home/chelli/vdr/cvs/dvb/linuxtv-dvb/build-2.4/Makefile linuxtv-dvb/build-2.4/Makefile
---- /home/chelli/vdr/cvs/dvb/linuxtv-dvb/build-2.4/Makefile	2004-05-23 11:09:03.000000000 +0200
-+++ linuxtv-dvb/build-2.4/Makefile	2004-05-30 20:31:04.000000000 +0200
-@@ -60,7 +60,7 @@
+--- /home/chelli/vdr/cvs/dvb/linuxtv-dvb/build-2.4/Makefile	2004-02-14 22:00:53.000000000 +0100
++++ linuxtv-dvb/build-2.4/Makefile	2004-05-31 00:11:11.000000000 +0200
+@@ -60,24 +60,28 @@
  
  multi-m		:= $(filter $(list-multi), $(obj-m))
  int-m		:= $(sort $(foreach m, $(multi-m), $($(basename $(m))-objs)))
 -EXTRA_CFLAGS	:= -MD -I ../linux/include -I . -DCONFIG_DVB_AV7110_OSD
+-
+-include $(TOPDIR)/Rules.make
+-
 +EXTRA_CFLAGS	:= -MD -I ../linux/include -I /usr/include -I . -DCONFIG_DVB_AV7110_OSD
  
- include $(TOPDIR)/Rules.make
- 
-@@ -70,9 +70,9 @@
+ else
+ # take version info from last module build if available
  KERNELRELEASE	:= $(shell cat $(obj)/.version 2>/dev/null || uname -r)
  endif
  
 -KDIR		:= /lib/modules/$(KERNELRELEASE)/build
 +KDIR		:= $(KSRC)
  PWD		:= $(shell pwd)
--DEST		:= /lib/modules/$(KERNELRELEASE)/$(MDIR)
-+DEST		:= debian/dvb-driver-$(KVERS)/lib/modules/$(KVERS)/misc/
+ DEST		:= /lib/modules/$(KERNELRELEASE)/$(MDIR)
  
++export KCFLAGS= -D__KERNEL__ -I$(KSRC)include -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -fomit-frame-pointer -pipe -mpreferred-stack-boundary=2 -march=i386 -DMODULE -DMODVERSIONS -include $(KSRC)include/linux/modversions.h -MD -I ../linux/include -I ./include -I. -DCONFIG_DVB_AV7110_OSD -nostdinc -iwithprefix include -DEXPORT_SYMTAB -c
++
++all: $(obj-m)
++
++%.o: %.c
++	$(CC) $(KCFLAGS) $<
++
  build:
  	[ -L saa7146_video.c ] || ./getlinks
+ 	$(MAKE) -C $(KDIR) CC="gcc -I$(PWD)/include" SUBDIRS=$(PWD) modules
+ 
+ install:
+ 	mkdir -p $(DESTDIR)$(DEST); cp -v $(obj-m) $(DESTDIR)$(DEST)
+ 
 diff -urNad /home/chelli/vdr/cvs/dvb/linuxtv-dvb/Makefile linuxtv-dvb/Makefile
 --- /home/chelli/vdr/cvs/dvb/linuxtv-dvb/Makefile	2004-05-23 10:56:26.000000000 +0200
-+++ linuxtv-dvb/Makefile	2004-05-30 20:30:47.000000000 +0200
++++ linuxtv-dvb/Makefile	2004-05-31 00:10:50.000000000 +0200
 @@ -3,7 +3,7 @@
  CVSROOT     := $(shell cat CVS/Root)
  RELEASE_TAG := LINUXTV-DVB-$(subst .,_,$(subst -,_,$(VERSION)))