Changeset 38178 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jul 26, 2011 12:10:20 PM (14 years ago)

Author:

vboxsync

Message:

Additions/linux/Makefile.kmk: Use the new install feature allow abs paths within PATH_OBJ to be specified as _INST/_STEP.

File:

• trunk/src/VBox/Additions/linux/Makefile.kmk (modified) (7 diffs)

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

@@ -303 +303 @@
 
 INSTALLS += GuestDrivers-src
-GuestDrivers-src_INST = bin/additions/src/
+GuestDrivers-src_INST = $(INST_ADDITIONS)src/
 GuestDrivers-src_MODE = a+r,u+w
 GuestDrivers-src_SOURCES = Makefile
@@ -309 +309 @@
 
 INSTALLS += lnx_add_inst-exec
-lnx_add_inst-exec_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_MOD_DIR))
-lnx_add_inst-exec_MODE = a+rx,u+w
-lnx_add_inst-exec_SOURCES = \
+lnx_add_inst-exec_INST     = $(VBOX_LNX_ADD_INST_MOD_DIR)
+lnx_add_inst-exec_INSTTYPE = stage
+lnx_add_inst-exec_MODE     = a+rx,u+w
+lnx_add_inst-exec_SOURCES  = \
         $(VBOX_REL_X11_ADD_INST)98vboxadd-xclient \
         $(VBOX_REL_X11_ADD_INST)x11config.sh
@@ -317 +318 @@
 
 INSTALLS += lnx_add_inst-noexec
-lnx_add_inst-noexec_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_SHARE_DIR)$(VBOX_LNX_ADD_PACKAGE_NAME))/
-lnx_add_inst-noexec_MODE = a+r,u+w
-lnx_add_inst-noexec_SOURCES = \
+lnx_add_inst-noexec_INST     = $(VBOX_LNX_ADD_INST_SHARE_DIR)$(VBOX_LNX_ADD_PACKAGE_NAME)/
+lnx_add_inst-noexec_INSTTYPE = stage
+lnx_add_inst-noexec_MODE     = a+r,u+w
+lnx_add_inst-noexec_SOURCES  = \
         $(VBOX_REL_X11_ADD_INST)vboxclient.desktop \
         $(VBOX_REL_X11_ADD_INST)vboxvideo.ids \
@@ -329 +331 @@
 
 INSTALLS += lnx_add_inst-license
-lnx_add_inst-license_INST = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_OUT_DIR))
-lnx_add_inst-license_MODE = a+r,u+w
-lnx_add_inst-license_SOURCES = \
+lnx_add_inst-license_INST     = $(VBOX_LNX_ADD_INST_OUT_DIR)
+lnx_add_inst-license_INSTTYPE = stage
+lnx_add_inst-license_MODE     = a+r,u+w
+lnx_add_inst-license_SOURCES  = \
         $(VBOX_BRAND_LICENSE_TXT)=>LICENSE
 
@@ -340 +343 @@
 #
 INSTALLS += LnxAdd-scripts
-LnxAdd-scripts_INST    = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_STAGE_DIR))
-LnxAdd-scripts_MODE    = a+rx,u+w
-LnxAdd-scripts_SOURCES = \
+LnxAdd-scripts_INST     = $(VBOX_LNX_ADD_INST_STAGE_DIR)
+LnxAdd-scripts_INSTTYPE = stage
+LnxAdd-scripts_MODE     = a+rx,u+w
+LnxAdd-scripts_SOURCES  = \
         $(VBOX_REL_LNX_INST_SRC)routines.sh \
         $(VBOX_REL_LNX_ADD_INST)vboxadd.sh=>vboxadd \
@@ -354 +358 @@
 #
 INSTALLS += LnxAdd-Nostrip-Bin
-LnxAdd-Nostrip-Bin_INST    = $(subst $(PATH_TARGET),obj,$(VBOX_LNX_ADD_INST_BIN_DIR))
-LnxAdd-Nostrip-Bin_MODE    = a+rx,u+w
-LnxAdd-Nostrip-Bin_SOURCES = \
+LnxAdd-Nostrip-Bin_INST     = $(VBOX_LNX_ADD_INST_BIN_DIR)
+LnxAdd-Nostrip-Bin_INSTTYPE = stage
+LnxAdd-Nostrip-Bin_MODE     = a+rx,u+w
+LnxAdd-Nostrip-Bin_SOURCES  = \
         $(VBOX_REL_X11_ADD_INST)98vboxadd-xclient=>VBoxClient-all
 
@@ -470 +475 @@
                 /bin/sh ./install.sh "\$$0 1> /dev/null"
 
+