open-vm-tools: propagate --with-linuxdir value to makefiles.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac
index 905fcc4350f7bc51d06e93e33a08c7f8f338969b..ac9de9895c2654acdfd9e6e23c6bacabf437fac2 100644 (file)
--- a/open-vm-tools/configure.ac
+++ b/open-vm-tools/configure.ac
@@ -148,6 +148,10 @@ if test "$with_kernel_modules" = "yes"; then
          if test ! -d "$LINUXDIR/kernel/"; then
              AC_MSG_ERROR([$LINUXDIR/kernel does not exist])
          fi
+         LINUXINCLUDE="$LINUXDIR/build/include"
+         if test ! -d "$LINUXINCLUDE"; then
+            AC_MSG_ERROR([Can't find include dir under $LINUXDIR])
+         fi
          ;;
 
       freebsd)
@@ -1131,6 +1135,7 @@ AC_SUBST([HGFS_LIBS])
 AC_SUBST([TOOLS_VERSION])
 AC_SUBST([TARGET_OS])
 AC_SUBST([KERNEL_RELEASE])
+AC_SUBST([LINUXINCLUDE])
 AC_SUBST([MODULES_OS])
 AC_SUBST([MODULES_DIR])
 AC_SUBST([MODULES])

diff --git a/open-vm-tools/modules/Makefile.am b/open-vm-tools/modules/Makefile.am
index c1e92b950859e166081eac07a877a5dcabbf39f2..f87f26e249575c9a2374a4e5f4ef35145ec587f4 100644 (file)
--- a/open-vm-tools/modules/Makefile.am
+++ b/open-vm-tools/modules/Makefile.am
@@ -17,6 +17,7 @@ EXTRA_ARGS += "SYSDIR=@SYSDIR@"
 endif
 
 if LINUX
+export LINUXINCLUDE := @LINUXINCLUDE@
 export vmblockdir := $(MODULES_DIR)/fs/vmblock
 export vmcidir := $(MODULES_DIR)/drivers/misc
 export vmhgfsdir := $(MODULES_DIR)/fs/vmhgfs

diff --git a/open-vm-tools/modules/linux/vmblock/Makefile b/open-vm-tools/modules/linux/vmblock/Makefile
index 50349778aeedcee302c0246df6f9472a08c2d9ea..b2328b767a47c07194bd52640558c1ffc8ac38db 100644 (file)
--- a/open-vm-tools/modules/linux/vmblock/Makefile
+++ b/open-vm-tools/modules/linux/vmblock/Makefile
@@ -46,7 +46,11 @@ endif
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
+ifdef LINUXINCLUDE
+HEADER_DIR = $(LINUXINCLUDE)
+else
 HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+endif
 
 BUILD_DIR = $(HEADER_DIR)/..
 

diff --git a/open-vm-tools/modules/linux/vmci/Makefile b/open-vm-tools/modules/linux/vmci/Makefile
index 5619c48a749a63363b9e8ec77b490a6becfed2fc..3e14ea469db795ee654d13bd32d61b29d94c38db 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/Makefile
+++ b/open-vm-tools/modules/linux/vmci/Makefile
@@ -46,7 +46,11 @@ endif
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
+ifdef LINUXINCLUDE
+HEADER_DIR = $(LINUXINCLUDE)
+else
 HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+endif
 
 BUILD_DIR = $(HEADER_DIR)/..
 

diff --git a/open-vm-tools/modules/linux/vmhgfs/Makefile b/open-vm-tools/modules/linux/vmhgfs/Makefile
index c4ec0f67f4aebde099e80261202e0a7ddaa6f706..350eb90c193c4d1f6a3db6e1f39d58c1cdf13e6c 100644 (file)
--- a/open-vm-tools/modules/linux/vmhgfs/Makefile
+++ b/open-vm-tools/modules/linux/vmhgfs/Makefile
@@ -46,7 +46,11 @@ endif
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
+ifdef LINUXINCLUDE
+HEADER_DIR = $(LINUXINCLUDE)
+else
 HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+endif
 
 BUILD_DIR = $(HEADER_DIR)/..
 

diff --git a/open-vm-tools/modules/linux/vmsync/Makefile b/open-vm-tools/modules/linux/vmsync/Makefile
index cf1e6392b95d20a9999142d064d55dc9d500be82..e65e95d8a5edb3abd918d53cbcf3edba57a9e8e5 100644 (file)
--- a/open-vm-tools/modules/linux/vmsync/Makefile
+++ b/open-vm-tools/modules/linux/vmsync/Makefile
@@ -46,7 +46,11 @@ endif
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
+ifdef LINUXINCLUDE
+HEADER_DIR = $(LINUXINCLUDE)
+else
 HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+endif
 
 BUILD_DIR = $(HEADER_DIR)/..
 

diff --git a/open-vm-tools/modules/linux/vmxnet/Makefile b/open-vm-tools/modules/linux/vmxnet/Makefile
index 33e94d0f8ba1f0a3f3e392bd4edbadf8ba74ee9c..aabcdd8f97b4aa0b02b9f58282494e4de3b5d909 100644 (file)
--- a/open-vm-tools/modules/linux/vmxnet/Makefile
+++ b/open-vm-tools/modules/linux/vmxnet/Makefile
@@ -46,7 +46,11 @@ endif
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
+ifdef LINUXINCLUDE
+HEADER_DIR = $(LINUXINCLUDE)
+else
 HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+endif
 
 BUILD_DIR = $(HEADER_DIR)/..
 

diff --git a/open-vm-tools/modules/linux/vsock/Makefile b/open-vm-tools/modules/linux/vsock/Makefile
index d700d8807d066752ede0feced251fe05c7dee9f3..ccde6f24eec3cdc9650cd4809786e8420a14c2ec 100644 (file)
--- a/open-vm-tools/modules/linux/vsock/Makefile
+++ b/open-vm-tools/modules/linux/vsock/Makefile
@@ -46,7 +46,11 @@ endif
 VM_UNAME = $(shell uname -r)
 
 # Header directory for the running kernel
+ifdef LINUXINCLUDE
+HEADER_DIR = $(LINUXINCLUDE)
+else
 HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include
+endif
 
 BUILD_DIR = $(HEADER_DIR)/..