Changeset 3400 in vbox

Timestamp:

Jul 3, 2007 8:12:52 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

22601

Message:

Linux modules: don't demand on the MODULE_DIR if we don't install the kernel

Location:

trunk/src/VBox

Files:

• Additions/linux/module/Makefile.module (modified) (1 diff)
• Additions/linux/sharedfolders/Makefile.module (modified) (1 diff)
• HostDrivers/Support/linux/Makefile (modified) (1 diff)

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

@@ -62 +62 @@
 
 # module install dir.
-ifndef MODULE_DIR
- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
- ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-  MODULE_DIR := $(MODULE_DIR_TST)/misc
- else
-  $(error Unable to find the folder to install the additions driver to)
- endif
-endif # MODULE_DIR unspecified
+ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
+ ifndef MODULE_DIR
+  MODULE_DIR_TST := /lib/modules/$(shell uname -r)
+  ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
+   MODULE_DIR := $(MODULE_DIR_TST)/misc
+  else
+   $(error Unable to find the folder to install the additions driver to)
+  endif
+ endif # MODULE_DIR unspecified
+endif
 
 # guess kernel version (24 or 26)

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

@@ -63 +63 @@
 
 # module install dir.
-ifndef MODULE_DIR
- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
- ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-  MODULE_DIR := $(MODULE_DIR_TST)/misc
- else
-  $(error Unable to find the folder to install the shared folders driver to)
- endif
-endif # MODULE_DIR unspecified
+ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
+ ifndef MODULE_DIR
+  MODULE_DIR_TST := /lib/modules/$(shell uname -r)
+  ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
+   MODULE_DIR := $(MODULE_DIR_TST)/misc
+  else
+   $(error Unable to find the folder to install the shared folders driver to)
+  endif
+ endif # MODULE_DIR unspecified
+endif
 
 # guess kernel version (24 or 26)

trunk/src/VBox/HostDrivers/Support/linux/Makefile

@@ -90 +90 @@
 
 # module install dir.
-ifndef MODULE_DIR
- MODULE_DIR_TST := /lib/modules/$(shell uname -r)
- ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
-  MODULE_DIR := $(MODULE_DIR_TST)/misc
- else
-  $(error Unable to find the folder to install the support driver to)
- endif
-endif # MODULE_DIR unspecified
+ifneq ($(filter install install_rpm,$(MAKECMDGOALS)),)
+ ifndef MODULE_DIR
+  MODULE_DIR_TST := /lib/modules/$(shell uname -r)
+  ifeq ($(shell if test -d $(MODULE_DIR_TST); then echo yes; fi),yes)
+   MODULE_DIR := $(MODULE_DIR_TST)/misc
+  else
+   $(error Unable to find the folder to install the support driver to)
+  endif
+ endif # MODULE_DIR unspecified
+endif
 
 # guess kernel version (24 or 26)