From: Frank Mori Hess <fmhess@speakeasy.net>
Date: Tue, 5 Aug 2003 22:39:40 +0000 (+0000)
Subject: config/modversions.h and linux/modversions.h are not equivalent
X-Git-Tag: r0_7_69~271
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6e2039dd6bf8055c0f9d41545ca86a12f01cd1e2;p=comedi.git

config/modversions.h and linux/modversions.h are not equivalent
---

diff --git a/Makefile.modbuild b/Makefile.modbuild
index 2a1e8c8c..993489c9 100644
--- a/Makefile.modbuild
+++ b/Makefile.modbuild
@@ -80,14 +80,14 @@ _modinst_%:
 
 
 ifeq ($(CONFIG_MODVERSIONS),y)
-MODFLAGS += -DMODVERSIONS -include $(MODVERSIONS_H_PATH)
+MODFLAGS += -DMODVERSIONS -include $(LINUXDIR)/include/linux/modversions.h
 endif
 
 
 modules:	$(patsubst %, _mod_%, $(SUBDIRS))
 
 $(patsubst %, _mod_%, $(SUBDIRS)) : dummy
-	$(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS) $(MODFLAGS)" MAKING_MODULES=1 modules
+	$(MAKE) -C $(patsubst _mod_%, %, $@) CFLAGS="$(CFLAGS)" MAKING_MODULES=1 modules
 
 include/version.h: Makefile
 	@echo \#define $(PROJECT)_RELEASE \"$(PROJECTRELEASE)\" >.ver
diff --git a/scripts/linux_flags-2.6/Makefile b/scripts/linux_flags-2.6/Makefile
index b7315577..46bf0fbb 100644
--- a/scripts/linux_flags-2.6/Makefile
+++ b/scripts/linux_flags-2.6/Makefile
@@ -7,7 +7,6 @@ $(obj)/fake.c: flags
 .PHONY: flags
 flags:
 	echo LINUXDIR=$(LINUXDIR) >$(obj)/flags
-	echo MODVERSIONS_H_PATH=$(LINUXDIR)/include/config/modversions.h >>$(obj)/flags
 	echo ARCH=$(ARCH) >>$(obj)/flags
 	echo AFLAGS="$(AFLAGS)" | sed 's_Iinclude_I"$(LINUXDIR)/include"_g'>>$(obj)/flags
 	echo LDFLAGS= >>$(obj)/flags
diff --git a/scripts/linux_flags/Makefile b/scripts/linux_flags/Makefile
index 7cc35744..98c65ff4 100644
--- a/scripts/linux_flags/Makefile
+++ b/scripts/linux_flags/Makefile
@@ -6,7 +6,6 @@ all:
 
 modules:
 	echo LINUXDIR=$(LINUXDIR) >flags
-	echo MODVERSIONS_H_PATH=$(LINUXDIR)/include/linux/modversions.h >>flags
 	echo ARCH=$(ARCH) >>flags
 	echo AFLAGS="$(AFLAGS)" >>flags
 	echo LDFLAGS="$(LDFLAGS)" >>flags