Changeset 6592 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 30, 2008 10:24:13 AM (17 years ago)

Author:

vboxsync

Message:

fixed detection of 2.6.18 fc6/rhel5

File:

• trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module (modified) (1 diff)

trunk/src/VBox/Additions/linux/sharedfolders/Makefile.module

@@ -160 +160 @@
 $(MODULE)-y  := $(OBJS)
 
-# detect FC6 2.6.18
-KFLAGS += $(foreach inc,$(KERN_INCL),\
-            $(if $(wildcard $(inc)/linux/utsrelease.h),\
-              $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
-                then echo yes; fi),-DKERNEL_FC6,),))
-# detect rhel5 2.6.18
-KFLAGS += $(foreach inc,$(KERN_INCL),\
-            $(if $(wildcard $(inc)/linux/utsrelease.h),\
-              $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
-                then echo yes; fi),-DKERNEL_FC6,),))
+# special hack for FC6 2.6.18 and rhel5 2.6.18
+ifeq ($(KERNELRELEASE),)
+ KFLAGS += $(foreach inc,$(KERN_INCL),\
+             $(if $(wildcard $(inc)/linux/utsrelease.h),\
+               $(if $(shell if grep -q '"2.6.18.*fc6.*"' $(inc)/linux/utsrelease.h;\
+                 then echo yes; fi),-DKERNEL_FC6,),) \
+             $(if $(wildcard $(inc)/linux/utsrelease.h),\
+               $(if $(shell if grep -q '"2.6.18.*el5.*"' $(inc)/linux/utsrelease.h;\
+                 then echo yes; fi),-DKERNEL_FC6,),))
+else
+ KFLAGS += $(filter -DKERNEL_FC6,$(patsubst 2.6.18%fc6,-DKERNEL_FC6,$(KERNELRELEASE)) \
+                                 $(patsubst 2.6.18%el5,-DKERNEL_FC6,$(KERNELRELEASE)))
+endif
 
 # build defs