Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 13559
Collapse All | Expand All

(-)Makefile.orig (-4 / +3 lines)
Lines 22-31 Link Here
22
# this is slightly more brain-dead, but works..
22
# this is slightly more brain-dead, but works..
23
ifeq ($(shell if test -d $(KERNDIR)/build; then echo yes; fi),yes)
23
ifeq ($(shell if test -d $(KERNDIR)/build; then echo yes; fi),yes)
24
KERNINC=$(KERNDIR)/build/include
24
KERNINC=$(KERNDIR)/build/include
25
MACHINC=$(KERNDIR)/build/arch/i386/mach-generic
26
else
25
else
27
KERNINC=/usr/src/linux/include
26
KERNINC=/usr/src/linux/include
28
MACHINC=/usr/src/linux/arch/i386/mach-generic
29
endif
27
endif
30
28
31
ifeq ($(shell if test -d $(KERNDIR)/kernel; then echo yes; fi),yes)
29
ifeq ($(shell if test -d $(KERNDIR)/kernel; then echo yes; fi),yes)
Lines 60-68 Link Here
60
# allow specification of alternate include file tree on command line and extra defines
58
# allow specification of alternate include file tree on command line and extra defines
61
ifdef SYSINCLUDE
59
ifdef SYSINCLUDE
62
INCLUDES += -I$(SYSINCLUDE)
60
INCLUDES += -I$(SYSINCLUDE)
61
INCLUDES += -I$(SYSINCLUDE)/asm/mach-default
63
else
62
else
64
INCLUDES += -I$(KERNINC)
63
INCLUDES += -I$(KERNINC)
65
INCLUDES += -I$(MACHINC)
64
INCLUDES += -I$(KERNINC)/asm/mach-default
66
endif
65
endif
67
66
68
DEFINES+=$(EXTRA_DEFINES)
67
DEFINES+=$(EXTRA_DEFINES)
Lines 138-144 Link Here
138
	fi
137
	fi
139
138
140
nvidia.o: gcc-check $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) 
139
nvidia.o: gcc-check $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE) 
141
	ld -r -o $@ $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE)
140
	ld -d -r -o $@ $(LINUX_MODULE) $(RESMAN_KERNEL_MODULE)
142
	size $@
141
	size $@
143
142
144
$(VERSION_HDR): 
143
$(VERSION_HDR): 

Return to bug 13559