VirtualBox

Changeset 38082 in vbox


Ignore:
Timestamp:
Jul 20, 2011 2:26:24 PM (13 years ago)
Author:
vboxsync
Message:

*.kmk: Installation/staging adjustments (kBuild 0.2.0 preps).

Location:
trunk
Files:
44 edited

Legend:

Unmodified
Added
Removed

  • trunk/Config.kmk

    r38066 r38082  
    2929.SECONDTARGETEXPANSION:
    3030
    31 # Enable automatic installation of what's built.
    32 KBUILD_DO_AUTO_INSTALL := 1
    33 PASSES := $(filter-out PACKING,$(PASSES)) PACKING # temporary hack
    34 # Modify the order of the INSTALLS and OTHERS passes.
    35 DEFAULT_PASSES       := BLDPROGS LIBRARIES DLLS BINARIES INSTALLS OTHERS
     31# Installation and staging changes in the works for kBuild 0.2.0 and VBox 4.1.2.
     32if $(KMK_REVISION) >= 2475 \
     33 && $(KBUILD_VERSION_MAJOR) == 0 \
     34 && (   ($(KBUILD_VERSION_MINOR) == 1 && $(KBUILD_VERSION_PATCH) >= 99) \
     35     || $(KBUILD_VERSION_MINOR) >= 2)
     36 VBOX_WITH_0_2_0_KBUILD = 1
     37endif
     38
     39ifndef VBOX_WITH_0_2_0_KBUILD
     40 # Enable automatic installation of what's built.
     41 KBUILD_DO_AUTO_INSTALL := 1
     42 PASSES := $(filter-out PACKING,$(PASSES)) PACKING # temporary hack
     43 # Modify the order of the INSTALLS and OTHERS passes.
     44 DEFAULT_PASSES       := BLDPROGS LIBRARIES DLLS BINARIES INSTALLS OTHERS
     45endif
    3646# Modify the build types.
    37 ## @todo checked and dbgopt
    3847KBUILD_BLD_TYPES = release profile debug kprofile
    3948
    … …  
    7584# Changes related to this are marked VBOX_WITH_NEW_LAYOUT, while changes marked
    7685# VBOX_WITH_0_2_0_KBUILD are for building with current kBuild svn.
    77 if $(KMK_REVISION) >= 2475 \
    78  && $(KBUILD_VERSION_MAJOR) == 0 \
    79  && (   ($(KBUILD_VERSION_MINOR) == 1 && $(KBUILD_VERSION_PATCH) >= 99) \
    80      || $(KBUILD_VERSION_MINOR) >= 2)
    81  VBOX_WITH_0_2_0_KBUILD = 1
    82 endif
    8386ifndef VBOX_WITH_NEW_LAYOUT
    84  PATH_STAGE           = $(PATH_OUT)
    85  ifdef VBOX_WITH_0_2_0_KBUILD
     87 ifndef VBOX_WITH_0_2_0_KBUILD
     88  PATH_INS            = $(PATH_OUT)
     89  PATH_STAGE          = $(PATH_INS)
     90 else
    8691  PATH_INS            = $(PATH_OUT)/dist
    87  else
    88   PATH_INS            = $(PATH_OUT)
    89  endif
    90 endif
     92  PATH_STAGE          = $(PATH_OUT)
     93 endif
     94endif
     95
    9196ifeq ($(KBUILD_TARGET),darwin)
    9297 ifndef VBOX_WITH_NEW_LAYOUT
    … …  
    133138 INST_ADDITIONS_LIB   = $(INST_LIB)additions/
    134139endif
     140
     141INST_DOC              = doc/
    135142INST_EXTPACK          = $(INST_BIN)ExtensionPacks/
    136143INST_EXTPACK_CERTS    = $(INST_BIN)ExtPackCertificates/
    … …  
    138145INST_PACKAGES         = packages/
    139146
    140 PATH_BIN              = $(patsubst %/,%,$(PATH_INS)/$(INST_BIN))
    141 PATH_DLL              = $(patsubst %/,%,$(PATH_INS)/$(INST_DLL))
    142 PATH_SYS              = $(patsubst %/,%,$(PATH_INS)/$(INST_SYS))
    143 PATH_LIB              = $(patsubst %/,%,$(PATH_INS)/$(INST_LIB))
    144 PATH_DOC              = $(PATH_OUT)/doc
    145 VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_INS)/$(INST_SDK))
    146 VBOX_PATH_DIST        = $(patsubst %/,%,$(PATH_INS)/$(INST_DIST))
    147 VBOX_PATH_TESTSUITE   = $(patsubst %/,%,$(PATH_INS)/$(INST_TESTSUITE))
    148 VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_INS)/$(INST_ADDITIONS))
    149 VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_INS)/$(INST_ADDITIONS_ISO))
    150 VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_INS)/$(INST_ADDITIONS_LIB))
    151 VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_INS)/$(INST_EXTPACK_PUEL))
    152 VBOX_PATH_PACKAGES    = $(patsubst %/,%,$(PATH_INS)/$(INST_PACKAGES))
     147ifndef VBOX_WITH_0_2_0_KBUILD
     148 PATH_BIN             = $(patsubst %/,%,$(PATH_STAGE)/$(INST_BIN))
     149 PATH_DLL             = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DLL))
     150 PATH_SYS             = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SYS))
     151 PATH_LIB             = $(patsubst %/,%,$(PATH_STAGE)/$(INST_LIB))
     152 PATH_DOC             = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DOC))
     153 $(foreach path, BIN DLL SYS LIB DOC, $(eval PATH_STAGE_$(path) = $(PATH_$(path))))
     154endif
     155VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
     156VBOX_PATH_DIST        = $(patsubst %/,%,$(PATH_STAGE)/$(INST_DIST))
     157VBOX_PATH_TESTSUITE   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_TESTSUITE))
     158VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
     159VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
     160VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
     161VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
     162VBOX_PATH_PACKAGES    = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
    153163
    154164
    … …  
    15201530#
    15211531if1of ($(KBUILD_HOST), freebsd linux l4 netbsd openbsd solaris)
    1522  export LD_LIBRARY_PATH:=$(PATH_BIN):$(PATH_LIB):$(LD_LIBRARY_PATH)
     1532 export LD_LIBRARY_PATH:=$(PATH_STAGE_BIN):$(PATH_STAGE_LIB):$(LD_LIBRARY_PATH)
    15231533endif
    15241534ifeq ($(KBUILD_HOST),os2)
    1525  #fixme! export BEGINLIBPATH:=$(PATH_BIN);$(PATH_LIB);$(BEGINLIBPATH)
     1535 #fixme! export BEGINLIBPATH:=$(PATH_STAGE_BIN);$(PATH_STAGE_LIB);$(BEGINLIBPATH)
    15261536endif
    15271537ifeq ($(KBUILD_HOST),win)
    1528  export PATH:=$(PATH_BIN);$(PATH_LIB);$(PATH)
     1538 export PATH:=$(PATH_STAGE_BIN);$(PATH_STAGE_LIB);$(PATH)
    15291539endif
    15301540
    … …  
    15331543#
    15341544ifeq ($(KBUILD_TARGET),darwin)
    1535  LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.dylib
    1536  LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
    1537  LIB_KPROFILE    = $(PATH_BIN)/kPrf2.dylib
    1538  LIB_VMM         = $(PATH_BIN)/VBoxVMM.dylib
    1539  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
    1540  LIB_REM         = $(PATH_LIB)/VBoxREM.dylib
    1541  LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.dylib
    1542  LIB_DDU         = $(PATH_BIN)/VBoxDDU.dylib
     1545 LIB_RUNTIME     = $(PATH_STAGE_BIN)/VBoxRT.dylib
     1546 LIB_RUNTIME_EF  = #$(PATH_STAGE_LIB)/RuntimeEFCPP.a
     1547 LIB_KPROFILE    = $(PATH_STAGE_BIN)/kPrf2.dylib
     1548 LIB_VMM         = $(PATH_STAGE_BIN)/VBoxVMM.dylib
     1549 LIB_VMMGC       = $(PATH_STAGE_BIN)/VMMGC.gc
     1550 LIB_REM         = $(PATH_STAGE_LIB)/VBoxREM.dylib
     1551 LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXPCOM.dylib
     1552 LIB_DDU         = $(PATH_STAGE_BIN)/VBoxDDU.dylib
    15431553endif
    15441554ifeq ($(KBUILD_TARGET),l4)
    1545  LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.s.so
    1546  LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
    1547  LIB_KPROFILE    = $(PATH_BIN)/kPrf2.s.so
    1548  LIB_VMM         = $(PATH_BIN)/VBoxVMM.s.so
    1549  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
    1550  LIB_REM         = $(PATH_LIB)/VBoxREM.s.so
    1551  LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.s.so
    1552  LIB_DDU         = $(PATH_BIN)/VBoxDDU.s.so
     1555 LIB_RUNTIME     = $(PATH_STAGE_BIN)/VBoxRT.s.so
     1556 LIB_RUNTIME_EF  = #$(PATH_STAGE_LIB)/RuntimeEFCPP.a
     1557 LIB_KPROFILE    = $(PATH_STAGE_BIN)/kPrf2.s.so
     1558 LIB_VMM         = $(PATH_STAGE_BIN)/VBoxVMM.s.so
     1559 LIB_VMMGC       = $(PATH_STAGE_BIN)/VMMGC.gc
     1560 LIB_REM         = $(PATH_STAGE_LIB)/VBoxREM.s.so
     1561 LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXPCOM.s.so
     1562 LIB_DDU         = $(PATH_STAGE_BIN)/VBoxDDU.s.so
    15531563endif
    15541564if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
    1555  LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.so
    1556  LIB_RUNTIME_EF  = $(PATH_LIB)/RuntimeEFCPP.a
    1557  LIB_KPROFILE    = $(PATH_BIN)/kPrf2.so
    1558  LIB_VMM         = $(PATH_BIN)/VBoxVMM.so
    1559  LIB_VMMGC       = $(PATH_BIN)/VMMGC.gc
    1560  LIB_REM         = $(PATH_LIB)/VBoxREM.so
    1561  LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.so
    1562  LIB_DDU         = $(PATH_BIN)/VBoxDDU.so
     1565 LIB_RUNTIME     = $(PATH_STAGE_BIN)/VBoxRT.so
     1566 LIB_RUNTIME_EF  = $(PATH_STAGE_LIB)/RuntimeEFCPP.a
     1567 LIB_KPROFILE    = $(PATH_STAGE_BIN)/kPrf2.so
     1568 LIB_VMM         = $(PATH_STAGE_BIN)/VBoxVMM.so
     1569 LIB_VMMGC       = $(PATH_STAGE_BIN)/VMMGC.gc
     1570 LIB_REM         = $(PATH_STAGE_LIB)/VBoxREM.so
     1571 LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXPCOM.so
     1572 LIB_DDU         = $(PATH_STAGE_BIN)/VBoxDDU.so
    15631573endif
    15641574ifeq ($(KBUILD_TARGET),os2)
    1565  LIB_RUNTIME     = $(PATH_BIN)/VBoxRT.dll
    1566  LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.a
    1567  LIB_KPROFILE    = $(PATH_BIN)/kPrf2.dll
    1568  LIB_VMM         = $(PATH_BIN)/VBoxVMM.dll
    1569  LIB_VMMGC       = $(PATH_LIB)/VMMRCImp.lib
    1570  LIB_REM         = $(PATH_LIB)/VBoxREMImp.lib
    1571  LIB_XPCOM       = $(PATH_BIN)/VBoxXCOM.dll
    1572  LIB_DDU         = $(PATH_BIN)/VBoxDDU.dll
     1575 LIB_RUNTIME     = $(PATH_STAGE_BIN)/VBoxRT.dll
     1576 LIB_RUNTIME_EF  = #$(PATH_STAGE_LIB)/RuntimeEFCPP.a
     1577 LIB_KPROFILE    = $(PATH_STAGE_BIN)/kPrf2.dll
     1578 LIB_VMM         = $(PATH_STAGE_BIN)/VBoxVMM.dll
     1579 LIB_VMMGC       = $(PATH_STAGE_LIB)/VMMRCImp.lib
     1580 LIB_REM         = $(PATH_STAGE_LIB)/VBoxREMImp.lib
     1581 LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXCOM.dll
     1582 LIB_DDU         = $(PATH_STAGE_BIN)/VBoxDDU.dll
    15731583 VBOX_OBJ_SYS0   = $(PATH_OBJ)/RuntimeR0/os2/sys0.obj
    15741584endif
    15751585ifeq ($(KBUILD_TARGET),win)
    1576  LIB_RUNTIME     = $(PATH_LIB)/VBoxRT.lib
    1577  LIB_RUNTIME_EF  = #$(PATH_LIB)/RuntimeEFCPP.lib
    1578  LIB_KPROFILE    = $(PATH_LIB)/kPrf2.lib
    1579  LIB_VMM         = $(PATH_LIB)/VBoxVMM.lib
     1586 LIB_RUNTIME     = $(PATH_STAGE_LIB)/VBoxRT.lib
     1587 LIB_RUNTIME_EF  = #$(PATH_STAGE_LIB)/RuntimeEFCPP.lib
     1588 LIB_KPROFILE    = $(PATH_STAGE_LIB)/kPrf2.lib
     1589 LIB_VMM         = $(PATH_STAGE_LIB)/VBoxVMM.lib
    15801590 LIB_VMMGC       = $(PATH_OBJ)/VMMRC/VMMGC.lib
    1581  LIB_REM         = $(PATH_LIB)/VBoxREMImp.lib
    1582  LIB_XPCOM       = $(PATH_BIN)/VBoxXPCOM.dll
    1583  LIB_DDU         = $(PATH_LIB)/VBoxDDU.lib
    1584 endif
    1585 VBOX_LIB_SUPHARDENED    = $(PATH_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB)
    1586 VBOX_LIB_RUNTIME_STATIC = $(PATH_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
     1591 LIB_REM         = $(PATH_STAGE_LIB)/VBoxREMImp.lib
     1592 LIB_XPCOM       = $(PATH_STAGE_BIN)/VBoxXPCOM.dll
     1593 LIB_DDU         = $(PATH_STAGE_LIB)/VBoxDDU.lib
     1594endif
     1595VBOX_LIB_SUPHARDENED    = $(PATH_STAGE_LIB)/SUPR3HardenedStatic$(VBOX_SUFF_LIB)
     1596VBOX_LIB_RUNTIME_STATIC = $(PATH_STAGE_LIB)/RuntimeR3$(VBOX_SUFF_LIB)
    15871597
    15881598# Python
    … …  
    17201730 VBOX_WITH_XPCOM      = 1
    17211731 # if updating, also update xpidl_INST var in src/libs/xpcom18a4/Makefile.kmk
    1722  VBOX_XPIDL          ?= $(PATH_BIN)/xpidl$(HOSTSUFF_EXE)
     1732 VBOX_XPIDL          ?= $(PATH_STAGE_BIN)/xpidl$(HOSTSUFF_EXE)
    17231733 ifeq ($(KBUILD_TARGET),os2)
    17241734  VBOX_XPIDL_ENV      = BEGINLIBPATH="$(dir $(VBOX_XPIDL));$$BEGINLIBPATH"$(SP)
    … …  
    19841994 else
    19851995  VBOX_LIB_OGL_CRUTIL = $(VBOX_PATH_ADDITIONS)/VBoxOGLcrutil$(VBOX_SUFF_DLL)
    1986   VBOX_LIB_OGL_HOSTCRUTIL = $(PATH_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL)
     1996  VBOX_LIB_OGL_HOSTCRUTIL = $(PATH_STAGE_BIN)/VBoxOGLhostcrutil$(VBOX_SUFF_DLL)
    19871997 endif
    19881998
    … …  
    24032413#if1of ($(KBUILD_TARGET), os2 solaris win)
    24042414 SDK_VBOX_LIBXSLT_INCS   ?= $(PATH_ROOT)/src/libs/libxslt-1.1.22
    2405  SDK_VBOX_LIBXSLT_LIBS   ?= $(PATH_LIB)/VBox-libxslt$(VBOX_SUFF_LIB)
     2415 SDK_VBOX_LIBXSLT_LIBS   ?= $(PATH_STAGE_LIB)/VBox-libxslt$(VBOX_SUFF_LIB)
    24062416 SDK_VBOX_LIBXSLT_DEFS   ?=
    24072417 SDK_VBOX_LIBXSLT_DEFS.win += WIN32 _WINDOWS _MBCS _REENTRANT
    … …  
    24192429SDK_VBOX_LIBPNG       = .
    24202430SDK_VBOX_LIBPNG_INCS ?= $(PATH_ROOT)/src/libs/libpng-1.2.8
    2421 SDK_VBOX_LIBPNG_LIBS ?= $(PATH_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
     2431SDK_VBOX_LIBPNG_LIBS ?= $(PATH_STAGE_LIB)/VBox-libpng$(VBOX_SUFF_LIB)
    24222432
    24232433SDK_VBOX_ZLIB         = .
    24242434if1of ($(KBUILD_TARGET), os2 win)
    24252435 SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.1
    2426  SDK_VBOX_ZLIB_LIBS  ?= $(PATH_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
     2436 SDK_VBOX_ZLIB_LIBS  ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
    24272437else
    24282438 SDK_VBOX_ZLIB_INCS  ?=
    … …  
    24362446SDK_VBOX_OPENSSL_ORDERDEPS ?= $(crypto-headers_1_TARGET)
    24372447SDK_VBOX_OPENSSL_LIBS ?= \
    2438         $(PATH_LIB)/VBox-libssl$(VBOX_SUFF_LIB) \
    2439         $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
     2448        $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB) \
     2449        $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
    24402450# Build entire openssl library, not just the minimal subset.
    24412451if1of ($(KBUILD_TARGET), linux solaris)
    … …  
    24522462SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
    24532463SDK_VBOX_BLD_OPENSSL_LIBS ?= \
    2454         $(PATH_LIB)/VBoxBldProg-libcrypto$(VBOX_SUFF_LIB)
     2464        $(PATH_STAGE_LIB)/VBoxBldProg-libcrypto$(VBOX_SUFF_LIB)
    24552465
    24562466ifdef VBOX_WITH_S3
    … …  
    24582468SDK_VBOX_LIBCURL       = .
    24592469SDK_VBOX_LIBCURL_INCS ?= $(PATH_ROOT)/src/libs/curl-7.19.4/include
    2460 SDK_VBOX_LIBCURL_LIBS ?= $(PATH_LIB)/VBox-libcurl$(VBOX_SUFF_LIB)
     2470SDK_VBOX_LIBCURL_LIBS ?= $(PATH_STAGE_LIB)/VBox-libcurl$(VBOX_SUFF_LIB)
    24612471SDK_VBOX_LIBCURL_DEFS ?= BUILDING_LIBCURL
    24622472endif
    … …  
    24692479        $(PATH_ROOT)/src/libs/ffmpeg-20060710/libavformat
    24702480 ifeq ($(KBUILD_TARGET),win)
    2471   ## @todo Michael! Where is $(PATH_LIB)/VBoxFFmpegImp$(VBOX_SUFF_LIB) supposed to come from?
    2472   #SDK_VBOX_FFMPEG_LIBS ?= $(PATH_LIB)/VBoxFFmpeg.a
    2473   SDK_VBOX_FFMPEG_LIBS ?= $(PATH_LIB)/VBoxFFmpegImp.lib
     2481  ## @todo Michael! Where is $(PATH_STAGE_LIB)/VBoxFFmpegImp$(VBOX_SUFF_LIB) supposed to come from?
     2482  #SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_LIB)/VBoxFFmpeg.a
     2483  SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_LIB)/VBoxFFmpegImp.lib
    24742484 else
    2475   SDK_VBOX_FFMPEG_LIBS ?= $(PATH_BIN)/VBoxFFmpeg$(SUFF_DLL)
     2485  SDK_VBOX_FFMPEG_LIBS ?= $(PATH_STAGE_BIN)/VBoxFFmpeg$(SUFF_DLL)
    24762486 endif
    24772487else
    … …  
    24882498#
    24892499SDK_VBOX_NTDLL = Mini NTDLL import library, required IPRT.
    2490 SDK_VBOX_NTDLL_LIBS.x86   ?= $(PATH_LIB)/RuntimeR3NtDll-x86.lib
    2491 SDK_VBOX_NTDLL_LIBS.amd64 ?= $(PATH_LIB)/RuntimeR3NtDll-amd64.lib
     2500SDK_VBOX_NTDLL_LIBS.x86   ?= $(PATH_STAGE_LIB)/RuntimeR3NtDll-x86.lib
     2501SDK_VBOX_NTDLL_LIBS.amd64 ?= $(PATH_STAGE_LIB)/RuntimeR3NtDll-amd64.lib
    24922502
    24932503#
    … …  
    26032613  endif
    26042614  TEMPLATE_VBoxRc_LIBS              += \
    2605         $(PATH_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
     2615        $(PATH_STAGE_LIB)/RuntimeRCStub$(VBOX_SUFF_LIB)
    26062616  TEMPLATE_VBoxRc_POST_CMDS          = $(VBOX_SIGN_IMAGE_CMDS)
    26072617 endif # pe
    … …  
    27222732TEMPLATE_VBoxR0_LDFLAGS             = -Driver -Subsystem:NATIVE -Incremental:NO -Align:4096 -MapInfo:Exports -NoD $(VBOX_VCC_LD_WERR) -Debug
    27232733TEMPLATE_VBoxR0_LIBS                = \
    2724         $(PATH_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
     2734        $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
    27252735 ifdef VBOX_USE_WINDDK
    27262736TEMPLATE_VBoxR0_LIBS.x86            = \
    … …  
    27432753 TEMPLATE_VBoxR0_LDFLAGS.solaris    = -u _init -u _info
    27442754 TEMPLATE_VBoxR0_LIBS.solaris       = \
    2745         $(PATH_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
     2755        $(PATH_STAGE_LIB)/RuntimeR0Stub$(VBOX_SUFF_LIB)
    27462756else
    27472757 TEMPLATE_VBoxR0_LDFLAGS            = -nostdlib -Bsymbolic
    … …  
    36743684# Add COM/XPCOM stuff
    36753685TEMPLATE_VBOXMAINEXE_LIBS               += \
    3676         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
     3686        $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
    36773687ifdef VBOX_WITH_XPCOM
    36783688 ## @todo may be worth creating the VBOX_XPCOM SDK def
    … …  
    38233833   TEMPLATE_VBoxR3ExtPack_LIBS = \
    38243834        $(TEMPLATE_LIBS_VBOXR3) \
    3825         $(PATH_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
    3826         $(PATH_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
     3835        $(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
     3836        $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
    38273837  else
    38283838   TEMPLATE_VBoxR3ExtPack_LIBS = \
    38293839        $(TEMPLATE_LIBS_VBOXR3) \
    3830         $(PATH_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \
    3831         $(PATH_LIB)/VBoxRTImp$(VBOX_SUFF_DLL)
     3840        $(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \
     3841        $(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_DLL)
    38323842  endif
    38333843 else
    … …  
    38453855 if1of ($(VBOX_LDR_FMT), pe lx)
    38463856  TEMPLATE_VBoxR0ExtPack_LIBS = \
    3847         $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
    3848         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     3857        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
     3858        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    38493859 endif
    38503860
    … …  
    38573867 if1of ($(VBOX_LDR_FMT32), pe lx)
    38583868  TEMPLATE_VBoxRcExtPack_LIBS = \
    3859         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
    3860         $(PATH_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
     3869        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
     3870        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
    38613871 endif
    38623872
    … …  
    40964106 # Add COM/XPCOM stuff
    40974107 TEMPLATE_VBOXQT4GUIEXE_LIBS += \
    4098         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
     4108        $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB)
    40994109 ifdef VBOX_WITH_XPCOM
    41004110  ## @todo may be worth creating the VBOX_XPCOM SDK def, or just a SDK_VBOXXPCOM.
    … …  
    42964306TEMPLATE_VBoxAdvBldProg_DEFS    = $(TEMPLATE_VBOXBLDPROG_DEFS) IN_RT_R3
    42974307TEMPLATE_VBoxAdvBldProg_LIBS    = \
    4298         $(PATH_LIB)/RuntimeBldProg$(VBOX_SUFF_LIB) \
     4308        $(PATH_STAGE_LIB)/RuntimeBldProg$(VBOX_SUFF_LIB) \
    42994309        $(TEMPLATE_VBOXBLDPROG_LIBS)
    43004310TEMPLATE_VBoxAdvBldProg_LIBS.darwin = \
    … …  
    47754785         License-$(VBOX_LICENSE_VER).html \
    47764786         $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),License-$(VBOX_LICENSE_VER)-$(f).html)
    4777    VBOX_LICENSE_BINS = $(addprefix $(PATH_BIN)/,$(VBOX_LICENSE_FILES))
     4787   VBOX_LICENSE_BINS = $(addprefix $(PATH_STAGE_BIN)/,$(VBOX_LICENSE_FILES))
    47784788  endif
    47794789 endif

  • trunk/doc/manual/Makefile.kmk

    r36952 r38082  
    2424#   -- VirtualBox.chm
    2525#
    26 #   Both files end up in PATH_BIN.
     26#   Both files end up in PATH_STAGE_BIN.
    2727#
    2828#   Both targets indirectly depend on the XML files in this directory;
    … …  
    8282
    8383 ifdef VBOX_WITH_DOCS_CHM
    84   VBOX_PATH_BIN_CHM = $(PATH_BIN)/VirtualBox.chm
     84  VBOX_PATH_BIN_CHM = $(PATH_STAGE_BIN)/VirtualBox.chm
    8585 else
    8686  VBOX_PATH_BIN_CHM =
    … …  
    9090 ifndef VBOX_ONLY_SDK
    9191  VBOX_MANUAL_PACK += \
    92                 $(PATH_BIN)/UserManual.pdf \
     92                $(PATH_STAGE_BIN)/UserManual.pdf \
    9393                $(VBOX_PATH_BIN_CHM)
    9494  OTHERS += \
    95         $(PATH_BIN)/UserManual.pdf
     95        $(PATH_STAGE_BIN)/UserManual.pdf
    9696  OTHERS.win += \
    9797        $(VBOX_PATH_BIN_CHM)
    … …  
    101101  ifdef VBOX_WITH_DOCS_TRANSLATIONS
    102102   OTHERS += \
    103         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/UserManual_$(f).pdf)
     103        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf)
    104104   ifdef VBOX_WITH_DOCS_CHM
    105105   OTHERS.win += \
    106         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/VirtualBox_$(f).chm)
     106        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm)
    107107   OTHERS.linux += \
    108         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/VirtualBox_$(f).chm)
     108        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm)
    109109   endif
    110110  endif
    111111 endif # !VBOX_ONLY_SDK
    112112 ifdef VBOX_ONLY_DOCS
    113   PACKING += $(PATH_BIN)/VBoxDocumentation.zip
     113  PACKING += $(PATH_STAGE_BIN)/VBoxDocumentation.zip
    114114 endif
    115115
    … …  
    172172 ifdef VBOX_WITH_DOCS_CHM
    173173 VBOX_MANUAL_PACK += \
    174         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/UserManual_$(f).pdf $(PATH_BIN)/VirtualBox_$(f).chm)
     174        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf $(PATH_STAGE_BIN)/VirtualBox_$(f).chm)
    175175 endif
    176176
    … …  
    192192        $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/UserManual.pdf) \
    193193        $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/VirtualBox.chm) \
    194         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/UserManual_$(f).pdf) \
    195         $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/VirtualBox_$(f).chm) \
    196         $(PATH_BIN)/UserManual.pdf \
    197         $(PATH_BIN)/VirtualBox.chm \
     194        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf) \
     195        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm) \
     196        $(PATH_STAGE_BIN)/UserManual.pdf \
     197        $(PATH_STAGE_BIN)/VirtualBox.chm \
    198198        $(foreach f,en_US,$(VBOX_PATH_MANUAL_OUTBASE)/$f/SDKRef.pdf) \
    199         $(PATH_BIN)/sdk/docs/SDKRef.pdf \
     199        $(PATH_STAGE_BIN)/sdk/docs/SDKRef.pdf \
    200200        $(wildcard $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/HTMLHelp/*.h*)) \
    201201        $(foreach f,$(VBOX_MANUAL_LANGUAGES),\
    … …  
    234234 DOCBOOKPATH         ?= http://docbook.sourceforge.net/release/xsl/current/
    235235endif
    236 VBOXMANAGEPATH       ?= $(PATH_BIN)/VBoxManage$(SUFF_EXE)
     236VBOXMANAGEPATH       ?= $(PATH_STAGE_BIN)/VBoxManage$(SUFF_EXE)
    237237
    238238 # PDFLATEX_INTERACTION = errorstopmode - Use this when you wants to figure out build failures
    … …  
    493493
    494494## @todo INSTALLS target for this!
    495 $(PATH_BIN)/UserManual.pdf: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf | $$(dir $$@)
     495$(PATH_STAGE_BIN)/UserManual.pdf: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf | $$(dir $$@)
    496496        $(QUIET)$(CP) $< $@
    497497        $(call MSG_L1,Fresh LaTeX-generated PDF is now at $@)
    498498
    499 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/UserManual_$(f).pdf): \
    500         $(PATH_BIN)/UserManual_%.pdf : $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.pdf
     499$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf): \
     500        $(PATH_STAGE_BIN)/UserManual_%.pdf : $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.pdf
    501501        $(QUIET)$(CP) $< $@
    502502        $(call MSG_L1,Fresh LaTeX-generated PDF is now at $@)
    … …  
    594594
    595595ifdef VBOX_WITH_DOCS_CHM
    596 $(PATH_BIN)/VirtualBox.chm: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm
     596$(PATH_STAGE_BIN)/VirtualBox.chm: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm
    597597        $(QUIET)$(CP) $< $@
    598598        $(call MSG_L1,Fresh CHM is now at $@)
    599599
    600 $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_BIN)/VirtualBox_$(f).chm): \
    601         $(PATH_BIN)/VirtualBox_%.chm : $(VBOX_PATH_MANUAL_OUTBASE)/%/VirtualBox.chm
     600$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm): \
     601        $(PATH_STAGE_BIN)/VirtualBox_%.chm : $(VBOX_PATH_MANUAL_OUTBASE)/%/VirtualBox.chm
    602602        $(QUIET)$(CP) $< $@
    603603        $(call MSG_L1,Fresh CHM is now at $@)
    … …  
    641641
    642642# Packing the docs into a zip file
    643 $(PATH_BIN)/VBoxDocumentation.zip: $(VBOX_MANUAL_PACK)
     643$(PATH_STAGE_BIN)/VBoxDocumentation.zip: $(VBOX_MANUAL_PACK)
    644644        $(call MSG_L1,Packing documentation $@)
    645645        $(QUIET)$(RM) -f $@
    646         $(QUIET)$(REDIRECT) -C $(PATH_BIN) -- zip$(HOSTSUFF_EXE) -9 $@ $(notdir $^)
     646        $(QUIET)$(REDIRECT) -C $(PATH_STAGE_BIN) -- zip$(HOSTSUFF_EXE) -9 $@ $(notdir $^)
    647647endif # VBOX_WITH_DOCS_CHM
    648648

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

    r38005 r38082  
    154154 # (VBOX_WITHOUT_ADDITIONS_ISO is used by the additions build box, see the root makefile.)
    155155 ifndef VBOX_WITHOUT_ADDITIONS_ISO
    156   PACKING += $(PATH_BIN)/additions/VBoxGuestAdditions.iso
     156  PACKING += $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions.iso
    157157 endif
    158158endif # !VBOX_ONLY_TESTSUITE

  • trunk/src/VBox/Additions/WINNT/Graphics/Wine/Makefile.kmk

    r37840 r38082  
    174174wined3d_SOURCES.amd64 = vbox/libWineStub/debug.c
    175175wined3d_LIBS.x86      = \
    176     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
     176    $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB)
    177177wined3d_SDKS.amd64    = WINDDKWLH
    178    
     178
    179179ifdef VBOX_WITH_WDDM
    180180DLLS += wined3dwddm
    … …  
    246246    d3d8/d3d8.def
    247247VBoxD3D8_LIBS.x86 = \
    248     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
     248    $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB)
    249249VBoxD3D8_LIBS     = \
    250     $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
     250    $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB)
    251251VBoxD3D8_SOURCES.amd64 = vbox/libWineStub/debug.c
    252252VBoxD3D8_SDKS.amd64    = WINDDKWLH
    … …  
    287287    d3d9/volume.c \
    288288    d3d9/volumetexture.c
    289  
     289
    290290VBoxD3D9_SOURCES.x86      = \
    291291        d3d9/d3d9.def
    … …  
    294294        d3d9/d3d9xpdm.def
    295295VBoxD3D9_LIBS.x86         = \
    296     $(PATH_LIB)/libWine$(VBOX_SUFF_LIB)
     296    $(PATH_STAGE_LIB)/libWine$(VBOX_SUFF_LIB)
    297297VBoxD3D9_LIBS             = \
    298     $(PATH_LIB)/wined3d$(VBOX_SUFF_LIB)
     298    $(PATH_STAGE_LIB)/wined3d$(VBOX_SUFF_LIB)
    299299VBoxD3D9_SDKS.amd64    = WINDDKWLH
    300300
    … …  
    312312VBoxD3D9wddm_SOURCES.x86    = $(NO_SUCH_VARIABLE)
    313313VBoxD3D9wddm_SOURCES.amd64  = $(NO_SUCH_VARIABLE)
    314 VBoxD3D9wddm_LIBS           = $(PATH_LIB)/wined3dwddm$(VBOX_SUFF_LIB)
     314VBoxD3D9wddm_LIBS           = $(PATH_STAGE_LIB)/wined3dwddm$(VBOX_SUFF_LIB)
    315315VBoxD3D9wddm_LIBS.x86       = $(NO_SUCH_VARIABLE)
    316316VBoxD3D9wddm_SDKS           = WINDDKWLH
    … …  
    320320VBoxD3D9wddm-x86_EXTENDS      = VBoxD3D9wddm
    321321VBoxD3D9wddm-x86_BLD_TRG_ARCH = x86
    322 VBoxD3D9wddm-x86_LIBS         = $(PATH_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB)
     322VBoxD3D9wddm-x86_LIBS         = $(PATH_STAGE_LIB)/wined3dwddm-x86$(VBOX_SUFF_LIB)
    323323VBoxD3D9wddm-x86_DEFS         = $(VBoxD3D9wddm_DEFS) VBOX_WDDM_WOW64
    324324endif
    … …  
    348348    switcher/sw_d3d9xpdm.def
    349349d3d9_SDKS.amd64    = WINDDKWLH
    350    
     350
    351351
    352352include $(KBUILD_PATH)/subfooter.kmk

  • trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

    r37252 r38082  
    6464# The installer.
    6565#
    66 PACKING     += $(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
     66PACKING     += $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe
    6767OTHER_CLEAN += \
    68         $(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe \
    69         $(PATH_BIN)/additions/VBoxWHQLFake.exe
     68        $(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe \
     69        $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe
    7070
    7171DRIVER_FILES := \
    72         $(PATH_BIN)/additions/VBoxGuestDrvInst.exe \
    73         $(PATH_BIN)/additions/RegCleanup.exe \
    74         $(PATH_BIN)/additions/VBoxMouse.sys \
    75         $(PATH_BIN)/additions/VBoxGuest.sys \
    76         $(PATH_BIN)/additions/VBoxVideo.sys \
    77         $(PATH_BIN)/additions/VBoxDisp.dll \
    78         $(PATH_BIN)/additions/VBoxSF.sys \
    79         $(PATH_BIN)/additions/VBoxMRXNP.dll \
    80         $(PATH_BIN)/additions/VBoxTray.exe \
    81         $(PATH_BIN)/additions/VBoxControl.exe \
    82         $(PATH_BIN)/additions/VBoxWHQLFake.exe \
    83         $(PATH_BIN)/additions/VBoxService.exe
     72        $(PATH_STAGE_BIN)/additions/VBoxGuestDrvInst.exe \
     73        $(PATH_STAGE_BIN)/additions/RegCleanup.exe \
     74        $(PATH_STAGE_BIN)/additions/VBoxMouse.sys \
     75        $(PATH_STAGE_BIN)/additions/VBoxGuest.sys \
     76        $(PATH_STAGE_BIN)/additions/VBoxVideo.sys \
     77        $(PATH_STAGE_BIN)/additions/VBoxDisp.dll \
     78        $(PATH_STAGE_BIN)/additions/VBoxSF.sys \
     79        $(PATH_STAGE_BIN)/additions/VBoxMRXNP.dll \
     80        $(PATH_STAGE_BIN)/additions/VBoxTray.exe \
     81        $(PATH_STAGE_BIN)/additions/VBoxControl.exe \
     82        $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \
     83        $(PATH_STAGE_BIN)/additions/VBoxService.exe
    8484ifeq ($(KBUILD_TARGET_ARCH),x86)
    8585DRIVER_FILES += \
    86         $(PATH_BIN)/additions/VBoxMouseNT.sys \
    87         $(PATH_BIN)/additions/VBoxGuestNT.sys
    88 endif
    89 DRIVER_FILES += \
    90         $(PATH_BIN)/additions/VBoxVideo.inf \
    91         $(PATH_BIN)/additions/VBoxGuest.inf
     86        $(PATH_STAGE_BIN)/additions/VBoxMouseNT.sys \
     87        $(PATH_STAGE_BIN)/additions/VBoxGuestNT.sys
     88endif
     89DRIVER_FILES += \
     90        $(PATH_STAGE_BIN)/additions/VBoxVideo.inf \
     91        $(PATH_STAGE_BIN)/additions/VBoxGuest.inf
    9292ifdef VBOX_SIGN_ADDITIONS
    9393DRIVER_FILES += \
    94         $(PATH_BIN)/additions/VBoxVideo.cat \
    95         $(PATH_BIN)/additions/VBoxGuest.cat
     94        $(PATH_STAGE_BIN)/additions/VBoxVideo.cat \
     95        $(PATH_STAGE_BIN)/additions/VBoxGuest.cat
    9696endif
    9797ifdef VBOX_WITH_CROGL
    9898DRIVER_FILES += \
    99         $(PATH_BIN)/additions/VBoxOGLarrayspu.dll \
    100         $(PATH_BIN)/additions/VBoxOGLcrutil.dll \
    101         $(PATH_BIN)/additions/VBoxOGLerrorspu.dll \
    102         $(PATH_BIN)/additions/VBoxOGLpackspu.dll \
    103         $(PATH_BIN)/additions/VBoxOGLpassthroughspu.dll \
    104         $(PATH_BIN)/additions/VBoxOGLfeedbackspu.dll \
    105         $(PATH_BIN)/additions/VBoxOGL.dll \
    106         $(PATH_BIN)/additions/wined3d.dll \
    107         $(PATH_BIN)/additions/VBoxD3D9.dll \
    108         $(PATH_BIN)/additions/VBoxD3D8.dll
     99        $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu.dll \
     100        $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil.dll \
     101        $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu.dll \
     102        $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu.dll \
     103        $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu.dll \
     104        $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu.dll \
     105        $(PATH_STAGE_BIN)/additions/VBoxOGL.dll \
     106        $(PATH_STAGE_BIN)/additions/wined3d.dll \
     107        $(PATH_STAGE_BIN)/additions/VBoxD3D9.dll \
     108        $(PATH_STAGE_BIN)/additions/VBoxD3D8.dll
    109109 ifeq ($(KBUILD_TARGET_ARCH),x86)
    110110DRIVER_FILES += \
    111         $(PATH_BIN)/additions/libWine.dll
     111        $(PATH_STAGE_BIN)/additions/libWine.dll
    112112 endif
    113113 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    … …  
    131131ifdef VBOX_WITH_WDDM
    132132DRIVER_FILES += \
    133         $(PATH_BIN)/additions/VBoxVideoWddm.sys \
    134         $(PATH_BIN)/additions/VBoxVideoWddm.inf \
    135         $(PATH_BIN)/additions/VBoxDispD3D.dll
     133        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.sys \
     134        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.inf \
     135        $(PATH_STAGE_BIN)/additions/VBoxDispD3D.dll
    136136 ifdef VBOX_WITH_CROGL
    137137DRIVER_FILES += \
    138         $(PATH_BIN)/additions/wined3dwddm.dll \
    139         $(PATH_BIN)/additions/VBoxD3D9wddm.dll
     138        $(PATH_STAGE_BIN)/additions/wined3dwddm.dll \
     139        $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm.dll
    140140 endif
    141141 ifdef VBOX_SIGN_ADDITIONS
    142142DRIVER_FILES += \
    143         $(PATH_BIN)/additions/VBoxVideoWddm.cat
     143        $(PATH_STAGE_BIN)/additions/VBoxVideoWddm.cat
    144144 endif
    145145 ifeq ($(KBUILD_TARGET_ARCH),amd64)
    146146DRIVER_FILES += \
    147         $(PATH_BIN)/additions/VBoxDispD3D-x86.dll
     147        $(PATH_STAGE_BIN)/additions/VBoxDispD3D-x86.dll
    148148  ifdef VBOX_WITH_CROGL
    149149DRIVER_FILES += \
    150         $(PATH_BIN)/additions/wined3dwddm-x86.dll \
    151         $(PATH_BIN)/additions/VBoxD3D9wddm-x86.dll \
    152         $(PATH_BIN)/additions/VBoxOGL-x86.dll \
    153         $(PATH_BIN)/additions/VBoxOGLarrayspu-x86.dll \
    154         $(PATH_BIN)/additions/VBoxOGLcrutil-x86.dll \
    155         $(PATH_BIN)/additions/VBoxOGLerrorspu-x86.dll \
    156         $(PATH_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \
    157         $(PATH_BIN)/additions/VBoxOGLpackspu-x86.dll \
    158         $(PATH_BIN)/additions/VBoxOGLpassthroughspu-x86.dll
     150        $(PATH_STAGE_BIN)/additions/wined3dwddm-x86.dll \
     151        $(PATH_STAGE_BIN)/additions/VBoxD3D9wddm-x86.dll \
     152        $(PATH_STAGE_BIN)/additions/VBoxOGL-x86.dll \
     153        $(PATH_STAGE_BIN)/additions/VBoxOGLarrayspu-x86.dll \
     154        $(PATH_STAGE_BIN)/additions/VBoxOGLcrutil-x86.dll \
     155        $(PATH_STAGE_BIN)/additions/VBoxOGLerrorspu-x86.dll \
     156        $(PATH_STAGE_BIN)/additions/VBoxOGLfeedbackspu-x86.dll \
     157        $(PATH_STAGE_BIN)/additions/VBoxOGLpackspu-x86.dll \
     158        $(PATH_STAGE_BIN)/additions/VBoxOGLpassthroughspu-x86.dll
    159159  endif
    160160 endif
    … …  
    224224WHQLFAKE := $(PATH_SUB_CURRENT)/VBoxWHQLFake.au3
    225225
    226 $(PATH_BIN)/additions/VBoxWHQLFake.exe:
     226$(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe:
    227227        $(call MSG_L1,Creating $@, from $<)
    228228        $(QUIET)$(EXEC_X86_WIN32) $(VBOX_PATH_AUTOIT3)/Aut2Exe/Aut2exe.exe \
    229229                /in $(WHQLFAKE) \
    230                 /out $(PATH_BIN)/additions/VBoxWHQLFake.exe \
     230                /out $(PATH_STAGE_BIN)/additions/VBoxWHQLFake.exe \
    231231                /icon $(VBOX_WINDOWS_ADDITIONS_ICON_FILE) \
    232232                /comp 4 \
    233233                /unicode
    234234
    235 $(PATH_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
     235$(PATH_STAGE_BIN)/additions/VBoxWindowsAdditions-$(KBUILD_TARGET_ARCH).exe: \
    236236                $(PATH_SUB_CURRENT)/VBoxGuestAdditions.nsi \
    237237                $(DRIVER_FILES) \

  • trunk/src/VBox/Additions/WINNT/SharedFolders/redirector/sys/Makefile.kmk

    r31661 r38082  
    8989
    9090##        rdbss.asm \
    91 ##      $(PATH_LIB)/rdbss$(VBOXW32GUEST_SUFF_LIB)
     91##      $(PATH_STAGE_LIB)/rdbss$(VBOXW32GUEST_SUFF_LIB)
    9292
    9393

  • trunk/src/VBox/Additions/WINNT/VBoxHook/testcase/Makefile.kmk

    r28800 r38082  
    3030tstHook_SOURCES  = tstHook.cpp
    3131tstHook_INCS     = ../../include
    32 tstHook_LIBS     = $(PATH_LIB)/VBoxHook.lib
     32tstHook_LIBS     = $(PATH_STAGE_LIB)/VBoxHook.lib
    3333
    3434endif # VBOX_WITH_TESTCASES

  • trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk

    r35578 r38082  
    2424BLDDIRS += \
    2525        $(VBOX_PATH_CROGL_GENFILES)/
    26        
     26
    2727DLLS.win += \
    2828    VBoxOGL \
    … …  
    199199        $(VBOX_LIB_VBGL_R3_SHARED) \
    200200        $(VBOX_LIB_OGL_CRUTIL) \
    201         $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
     201        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB)
    202202if1of ($(KBUILD_TARGET), linux solaris freebsd)
    203203 VBoxOGL_LIBS += \
    204         $(PATH_LIB)/libXcomposite.so \
    205         $(PATH_LIB)/libXdamage.so \
    206         $(PATH_LIB)/libXfixes.so \
    207         $(PATH_LIB)/libXext.so
     204        $(PATH_STAGE_LIB)/libXcomposite.so \
     205        $(PATH_STAGE_LIB)/libXdamage.so \
     206        $(PATH_STAGE_LIB)/libXfixes.so \
     207        $(PATH_STAGE_LIB)/libXext.so
    208208 ifdef VBoxOGL_FAKEDRI
    209209  VBoxOGL_LIBS += \
    … …  
    214214ifdef VBOX_WITH_WDDM
    215215#
    216 # VBoxOGL-x86 - x86 VBoxOGL version built for amd64 build 
     216# VBoxOGL-x86 - x86 VBoxOGL version built for amd64 build
    217217#
    218218DLLS.win.amd64 += VBoxOGL-x86
    … …  
    222222        $(VBOX_LIB_VBGL_R3_SHARED_X86) \
    223223        $(VBOX_LIB_OGL_CRUTIL_X86) \
    224         $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB)
     224        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB)
    225225VBoxOGL-x86_SOURCES.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_SOURCES.win))
    226226VBoxOGL-x86_CLEAN.win = $(subst cropengl.def,cropengl-x86.def,$(VBoxOGL_CLEAN.win))
    … …  
    398398VBoxOGLarrayspu_LIBS          = \
    399399        $(VBOX_LIB_OGL_CRUTIL) \
    400         $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
    401         $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
     400        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
     401        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
    402402
    403403ifdef VBOX_WITH_WDDM
    … …  
    409409VBoxOGLarrayspu-x86_BLD_TRG_ARCH = x86
    410410VBoxOGLarrayspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
    411         $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
    412         $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
     411        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
     412        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
    413413VBoxOGLarrayspu-x86_DEFS = $(VBoxOGLarrayspu_DEFS) VBOX_WDDM_WOW64
    414414endif
    … …  
    437437VBoxOGLpassthroughspu_LIBS        = \
    438438        $(VBOX_LIB_OGL_CRUTIL)
    439        
     439
    440440ifdef VBOX_WITH_WDDM
    441441#
    … …  
    503503VBoxOGLpackspu_LIBS        = \
    504504        $(VBOX_LIB_OGL_CRUTIL) \
    505         $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
    506         $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
    507         $(PATH_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB)
     505        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
     506        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB) \
     507        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker$(VBOX_SUFF_LIB)
    508508
    509509ifdef VBOX_WITH_WDDM
    … …  
    515515VBoxOGLpackspu-x86_BLD_TRG_ARCH = x86
    516516VBoxOGLpackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
    517         $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
    518         $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
    519         $(PATH_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB)
     517        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
     518        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB) \
     519        $(PATH_STAGE_LIB)/additions/VBoxOGLcrpacker-x86$(VBOX_SUFF_LIB)
    520520VBoxOGLpackspu-x86_DEFS = $(VBoxOGLpackspu_DEFS) VBOX_WDDM_WOW64
    521521endif
    … …  
    574574VBoxOGLfeedbackspu_LIBS        = \
    575575        $(VBOX_LIB_OGL_CRUTIL) \
    576         $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
    577         $(PATH_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
    578        
     576        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
     577        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate$(VBOX_SUFF_LIB)
     578
    579579ifdef VBOX_WITH_WDDM
    580580#
    … …  
    585585VBoxOGLfeedbackspu-x86_BLD_TRG_ARCH = x86
    586586VBoxOGLfeedbackspu-x86_LIBS = $(VBOX_LIB_OGL_CRUTIL_X86) \
    587         $(PATH_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
    588         $(PATH_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
     587        $(PATH_STAGE_LIB)/additions/VBoxOGLspuload-x86$(VBOX_SUFF_LIB) \
     588        $(PATH_STAGE_LIB)/additions/VBoxOGLcrstate-x86$(VBOX_SUFF_LIB)
    589589VBoxOGLfeedbackspu-x86_DEFS = $(VBoxOGLfeedbackspu_DEFS) VBOX_WDDM_WOW64
    590590endif

  • trunk/src/VBox/Additions/freebsd/Makefile.kmk

    r28800 r38082  
    4343ifndef VBOX_OSE
    4444 BLDDIRS     += $(VBOX_FBSD_ADD_INS_OUT_DIR) $(VBOX_FBSD_ADD_INS_OUT_DIR)/module
    45  PACKING     += $(PATH_BIN)/additions/VBoxFreeBSDAdditions.tbz
     45 PACKING     += $(PATH_STAGE_BIN)/additions/VBoxFreeBSDAdditions.tbz
    4646 OTHER_CLEAN += $(PACKING)
    4747endif
    … …  
    9292# pattern rule for copying the debug info from the VBOX_FBSD_ADD_STRIP_BIN files to the installation directory
    9393$(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_DBG_SYM_FILES)): \
    94                 $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym : $(PATH_BIN)/additions/% | $$(dir $$@)
     94                $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    9595        $(call MSG_TOOL,copydbg,$<,$@)
    9696        $(QUIET)objcopy --only-keep-debug $< $@
    … …  
    9898# pattern rule for stripping and copying the VBOX_FBSD_ADD_STRIP_BIN files to the installation directory
    9999$(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_BIN)): \
    100                 $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_BIN)/additions/% \
     100                $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% \
    101101                $(VBOX_FBSD_ADD_INS_OUT_DIR)/%.dbgsym \
    102102                | $$(dir $$@)
    … …  
    107107# pattern rule for stripping and copying the VBOX_FBSD_ADD_STRIP_OBJ files to the installation directory
    108108$(addprefix $(VBOX_FBSD_ADD_INS_OUT_DIR)/,$(VBOX_FBSD_ADD_STRIP_OBJ)): \
    109                 $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_BIN)/additions/% | $$(dir $$@)
     109                $(VBOX_FBSD_ADD_INS_OUT_DIR)/% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    110110        $(call MSG_INST_FILE,$<,$@)
    111111ifeq ($(VBOX_DO_STRIP),)
    … …  
    119119# pattern rule for copying the VBOX_FBSD_ADD_MODULES files to the installation directory
    120120$(VBOX_FBSD_ADD_INS_MODULES): \
    121                 $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/% : $(PATH_BIN)/additions/src/% | $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/
     121                $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/% : $(PATH_STAGE_BIN)/additions/src/% | $(VBOX_FBSD_ADD_INS_OUT_DIR)/module/
    122122        $(call MSG_INST_FILE,$<,$@)
    123123# Remove target directories first, otherwise the behaviour of cp will not be
    … …  
    173173#        we've got everything included.
    174174#
    175 $(PATH_BIN)/additions/VBoxFreeBSDAdditions.tbz: \
     175$(PATH_STAGE_BIN)/additions/VBoxFreeBSDAdditions.tbz: \
    176176                $(INSTARGET_fbsd_add_inst-nobin) \
    177177                $(INSTARGET_fbsd_add_inst-bin) \
    … …  
    179179                $(VBOX_FBSD_ADD_INS_MODULES) \
    180180                $(VBOX_FBSD_ADD_INS_OUT_DIR)/install.sh \
    181                 $(wildcard $(PATH_BIN)/additions/src/*) \
    182                 $(wildcard $(PATH_BIN)/additions/src/*/*) \
    183                 $(wildcard $(PATH_BIN)/additions/src/*/*/*) \
    184                 $(wildcard $(PATH_BIN)/additions/src/*/*/*/*) \
     181                $(wildcard $(PATH_STAGE_BIN)/additions/src/*) \
     182                $(wildcard $(PATH_STAGE_BIN)/additions/src/*/*) \
     183                $(wildcard $(PATH_STAGE_BIN)/additions/src/*/*/*) \
     184                $(wildcard $(PATH_STAGE_BIN)/additions/src/*/*/*/*) \
    185185                $(VBOX_VERSION_STAMP)
    186186        pkg_create \

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

    r38005 r38082  
    7070VBOX_LNX_ADD_ARCHIVE.amd64 := $(PATH_OUT_BASE)/linux.amd64/$(KBUILD_TYPE)/bin/additions/VBoxGuestAdditions-amd64-r$(VBOX_SVN_REV).tar.bz2
    7171ifndef VBOX_WITH_COMBINED_LINUX_GUEST_PACKAGE
    72  VBOX_LNX_ADD_ARCHIVES := $(PATH_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV).tar.bz2
     72 VBOX_LNX_ADD_ARCHIVES := $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-$(KBUILD_TARGET_ARCH)-r$(VBOX_SVN_REV).tar.bz2
    7373else
    7474 VBOX_LNX_ADD_ARCHIVES := \
    … …  
    9494# This will only take effect if you also use VBOX_WITHOUT_ADDITIONS_ISO.
    9595PACKING     += \
    96         $(if-expr !defined(VBOX_WITHOUT_LINUX_GUEST_PACKAGE), $(PATH_BIN)/additions/VBoxLinuxAdditions.run,) \
     96        $(if-expr !defined(VBOX_WITHOUT_LINUX_GUEST_PACKAGE), $(PATH_STAGE_BIN)/additions/VBoxLinuxAdditions.run,) \
    9797        $(VBOX_LNX_ADD_ARCHIVES) \
    98         $(PATH_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2
     98        $(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2
    9999OTHER_CLEAN += \
    100100        $(PACKING) \
    … …  
    203203# pattern rules for copying the debug info from the VBOX_LNX_ADD_STRIP_* files to the installation directory
    204204$(addprefix $(VBOX_LNX_ADD_DBG_BIN_DIR),$(VBOX_LNX_ADD_STRIP_BIN)): \
    205                 $(VBOX_LNX_ADD_DBG_BIN_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@)
     205                $(VBOX_LNX_ADD_DBG_BIN_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    206206        $(call MSG_TOOL,copydbg,$<,$@)
    207207        $(QUIET)objcopy --only-keep-debug $< $@
    208208
    209209$(addprefix $(VBOX_LNX_ADD_DBG_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)): \
    210                 $(VBOX_LNX_ADD_DBG_SBIN_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@)
     210                $(VBOX_LNX_ADD_DBG_SBIN_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    211211        $(call MSG_TOOL,copydbg,$<,$@)
    212212        $(QUIET)objcopy --only-keep-debug $< $@
    213213
    214214$(addprefix $(VBOX_LNX_ADD_DBG_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)): \
    215                 $(VBOX_LNX_ADD_DBG_LIB_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@)
     215                $(VBOX_LNX_ADD_DBG_LIB_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    216216        $(call MSG_TOOL,copydbg,$<,$@)
    217217        $(QUIET)objcopy --only-keep-debug $< $@
    218218
    219219$(addprefix $(VBOX_LNX_ADD_DBG_MOD_DIR),$(VBOX_LNX_ADD_STRIP_MOD)): \
    220                 $(VBOX_LNX_ADD_DBG_MOD_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@)
     220                $(VBOX_LNX_ADD_DBG_MOD_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    221221        $(call MSG_TOOL,copydbg,$<,$@)
    222222        $(QUIET)objcopy --only-keep-debug $< $@
    … …  
    224224# pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_BIN files to the installation directory
    225225$(addprefix $(VBOX_LNX_ADD_INST_BIN_DIR),$(VBOX_LNX_ADD_STRIP_BIN)): \
    226                 $(VBOX_LNX_ADD_INST_BIN_DIR)% : $(PATH_BIN)/additions/% \
     226                $(VBOX_LNX_ADD_INST_BIN_DIR)% : $(PATH_STAGE_BIN)/additions/% \
    227227                $(VBOX_LNX_ADD_DBG_BIN_DIR)% \
    228228                | $$(dir $$@)
    … …  
    233233# pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_SBIN files to the installation directory
    234234$(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)): \
    235                 $(VBOX_LNX_ADD_INST_SBIN_DIR)% : $(PATH_BIN)/additions/% \
     235                $(VBOX_LNX_ADD_INST_SBIN_DIR)% : $(PATH_STAGE_BIN)/additions/% \
    236236                $(VBOX_LNX_ADD_DBG_SBIN_DIR)% \
    237237                | $$(dir $$@)
    … …  
    242242# pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_LIB files to the installation directory
    243243$(addprefix $(VBOX_LNX_ADD_INST_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)): \
    244                 $(VBOX_LNX_ADD_INST_LIB_DIR)% : $(PATH_BIN)/additions/% \
     244                $(VBOX_LNX_ADD_INST_LIB_DIR)% : $(PATH_STAGE_BIN)/additions/% \
    245245                $(VBOX_LNX_ADD_DBG_LIB_DIR)% \
    246246                | $$(dir $$@)
    … …  
    251251# pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_MOD files to the installation directory
    252252$(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_STRIP_MOD)): \
    253                 $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_BIN)/additions/% \
     253                $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_STAGE_BIN)/additions/% \
    254254                $(VBOX_LNX_ADD_DBG_MOD_DIR)% \
    255255                | $$(dir $$@)
    … …  
    260260# pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_OBJ files to the installation directory
    261261$(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_STRIP_OBJ)): \
    262                 $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@)
     262                $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    263263        $(call MSG_INST_FILE,$<,$@)
    264264ifeq ($(VBOX_DO_STRIP),)
    … …  
    272272# pattern rule for copying the VBOX_LNX_ADD_KMOD files to the installation directory
    273273$(addprefix $(VBOX_LNX_ADD_INST_KMOD_DIR),$(VBOX_LNX_ADD_KMOD)): \
    274                 $(VBOX_LNX_ADD_INST_KMOD_DIR_MOD)% : $(PATH_BIN)/additions/src/% | $$(dir $$@)
     274                $(VBOX_LNX_ADD_INST_KMOD_DIR_MOD)% : $(PATH_STAGE_BIN)/additions/src/% | $$(dir $$@)
    275275        $(call MSG_INST_DIR,$<,$@)
    276276        $(QUIET)$(RM) -Rf $@
    … …  
    279279# pattern rule for copying the VBOX_LNX_ADD_INIT files to the installation directory
    280280$(addprefix $(VBOX_LNX_ADD_INST_INIT_DIR),$(VBOX_LNX_ADD_INIT)): \
    281                 $(VBOX_LNX_ADD_INST_INIT_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@)
     281                $(VBOX_LNX_ADD_INST_INIT_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    282282        $(call MSG_INST_FILE,$<,$@)
    283283# Remove target directories first, otherwise the behaviour of cp will not be
    … …  
    288288# pattern rule for copying the VBOX_LNX_ADD_INIT files to the module directory
    289289$(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_INIT)): \
    290                 $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_BIN)/additions/% | $$(dir $$@)
     290                $(VBOX_LNX_ADD_INST_MOD_DIR)% : $(PATH_STAGE_BIN)/additions/% | $$(dir $$@)
    291291        $(call MSG_INST_FILE,$<,$@)
    292292# Remove target directories first, otherwise the behaviour of cp will not be
    … …  
    426426# .tar.bz2 containing the debug information
    427427#
    428 $(PATH_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2: \
     428$(PATH_STAGE_BIN)/additions/VBoxGuestAdditions-dbg.tar.bz2: \
    429429                $(VBOX_LNX_ADD_DBG_FILES) \
    430430                $(VBOX_LNX_ADD_INST_DEP_ON_MAKEFILE)
    … …  
    451451# any references should be made via variables assigned a know value via := .
    452452#
    453 $(PATH_BIN)/additions/VBoxLinuxAdditions.run: \
     453$(PATH_STAGE_BIN)/additions/VBoxLinuxAdditions.run: \
    454454                $(VBOX_LNX_ADD_ARCHIVES) \
    455455                $(VBOX_LNX_ADD_INST_STAGE_DIR)install.sh \

  • trunk/src/VBox/Additions/solaris/Makefile.kmk

    r36792 r38082  
    9494INSTALLS          += solaris-addcommon solaris-addcommonbins
    9595PROGRAMS          += VBoxAddISAExec
    96 PACKING           += $(PATH_BIN)/additions/$(PKGFILENAME)
     96PACKING           += $(PATH_STAGE_BIN)/additions/$(PKGFILENAME)
    9797OTHER_CLEAN       += $(PACKING) $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME)
    9898
    … …  
    107107
    108108#
    109 # Install to $(PATH_BIN)/additions/ files from various source paths (to pack them using rules)
     109# Install to $(PATH_STAGE_BIN)/additions/ files from various source paths (to pack them using rules)
    110110#
    111111solaris-addcommonbins_INST = bin/additions/
    … …  
    263263#
    264264
    265 $(PATH_BIN)/additions/$(PKGFILENAME): \
     265$(PATH_STAGE_BIN)/additions/$(PKGFILENAME): \
    266266                $(VBOX_VERSION_STAMP) \
    267267                $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/makepackage.sh \
    … …  
    316316endif
    317317        $(QUIET)$(SOLARIS_ADDINST_OUT_DIR)/makepackage.sh $(SOLARIS_ADDINST_OUT_DIR) $(PKGFILENAME) $(VBOX_SVN_REV)
    318         $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME) $(PATH_BIN)/additions/$(PKGFILENAME)
     318        $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME) $(PATH_STAGE_BIN)/additions/$(PKGFILENAME)
    319319        $(QUIET)$(RM) -f $(SOLARIS_ADDINST_OUT_DIR)/$(PKGFILENAME)
    320320

  • trunk/src/VBox/Debugger/Makefile.kmk

    r35628 r38082  
    124124  ifeq ($(KBUILD_TARGET),win)
    125125tstVBoxDbg_LIBS        += \
    126         $(PATH_LIB)/VBoxDbg.lib
     126        $(PATH_STAGE_LIB)/VBoxDbg.lib
    127127  else
    128128tstVBoxDbg_LIBS        += \
    129         $(PATH_BIN)/VBoxDbg$(VBOX_SUFF_DLL)
     129        $(PATH_STAGE_BIN)/VBoxDbg$(VBOX_SUFF_DLL)
    130130  endif
    131131 endif # TESTCASES

  • trunk/src/VBox/Devices/Makefile.kmk

    r37810 r38082  
    8181 VBoxDDU_LIBS             = \
    8282        $(LIB_RUNTIME) \
    83         $(PATH_LIB)/StorageLib$(VBOX_SUFF_LIB)
     83        $(PATH_STAGE_LIB)/StorageLib$(VBOX_SUFF_LIB)
    8484 ifdef VBOX_WITH_USB
    8585  VBoxDDU_LIBS           += \
    86         $(PATH_LIB)/USBLib$(VBOX_SUFF_LIB)
     86        $(PATH_STAGE_LIB)/USBLib$(VBOX_SUFF_LIB)
    8787  VBoxDDU_LIBS.win       += \
    88         $(PATH_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB)
     88        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB)
    8989 endif
    9090 ifeq ($(KBUILD_TARGET),l4)
    … …  
    171171
    172172 VBoxDD_LIBS             = \
    173         $(PATH_LIB)/DevicesR3$(VBOX_SUFF_LIB) \
    174         $(PATH_LIB)/Drivers$(VBOX_SUFF_LIB) \
    175         $(PATH_LIB)/VgaDefBiosLogo$(VBOX_SUFF_LIB) \
     173        $(PATH_STAGE_LIB)/DevicesR3$(VBOX_SUFF_LIB) \
     174        $(PATH_STAGE_LIB)/Drivers$(VBOX_SUFF_LIB) \
     175        $(PATH_STAGE_LIB)/VgaDefBiosLogo$(VBOX_SUFF_LIB) \
    176176        $(LIB_VMM) \
    177177        $(LIB_RUNTIME)
    … …  
    179179  VBoxDD_LIBS           += \
    180180        $(LIB_DDU) \
    181         $(PATH_LIB)/VBoxDD2.lib \
     181        $(PATH_STAGE_LIB)/VBoxDD2.lib \
    182182        $(PATH_SDK_DXSDK_LIB)/dxguid.lib
    183183 else
    … …  
    193193 ifdef VBOX_WITH_HGSMI
    194194  VBoxDD_LIBS           += \
    195         $(PATH_LIB)/HGSMIHostR3Lib$(VBOX_SUFF_LIB)
     195        $(PATH_STAGE_LIB)/HGSMIHostR3Lib$(VBOX_SUFF_LIB)
    196196 endif
    197197
    198198 ifdef VBOX_WITH_NETFLT
    199   VBoxDD_LIBS.win       += $(PATH_LIB)/WinNetConfig.lib
     199  VBoxDD_LIBS.win       += $(PATH_STAGE_LIB)/WinNetConfig.lib
    200200 endif
    201201
    202202 ifdef VBOX_WITH_EFI
    203   VBoxDD_LIBS           += $(PATH_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
     203  VBoxDD_LIBS           += $(PATH_STAGE_LIB)/EfiThunkBin$(VBOX_SUFF_LIB)
    204204 endif
    205205
    … …  
    243243        PC/DevLPC.cpp
    244244 VBoxDD2_LIBS            = \
    245         $(PATH_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
    246         $(PATH_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
    247         $(if $(VBOX_WITH_PXE_ROM),$(PATH_LIB)/NetBiosBin$(VBOX_SUFF_LIB),) \
     245        $(PATH_STAGE_LIB)/PcBiosBin$(VBOX_SUFF_LIB) \
     246        $(PATH_STAGE_LIB)/VgaBiosBin$(VBOX_SUFF_LIB) \
     247        $(if $(VBOX_WITH_PXE_ROM),$(PATH_STAGE_LIB)/NetBiosBin$(VBOX_SUFF_LIB),) \
    248248        $(LIB_VMM) \
    249249        $(LIB_RUNTIME)
    … …  
    640640  if1of ($(VBOX_LDR_FMT32), pe lx)
    641641  VBoxDDGC_LIBS           = \
    642         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
    643         $(PATH_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
     642        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
     643        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
    644644  endif
    645645 endif # VBOX_WITH_RAW_MODE
    … …  
    720720
    721721 if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
    722   VBoxDDR0_SOURCES      += 
     722  VBoxDDR0_SOURCES      +=
    723723        Bus/DevPciRaw.cpp
    724724 endif
    … …  
    752752 if1of ($(VBOX_LDR_FMT), pe lx)
    753753 VBoxDDR0_LIBS           = \
    754         $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
    755         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     754        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
     755        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    756756 endif
    757757
    … …  
    770770  if1of ($(VBOX_LDR_FMT32), pe lx)
    771771   VBoxDD2GC_LIBS          = \
    772         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
    773         $(PATH_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
     772        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
     773        $(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
    774774  endif
    775775 endif
    … …  
    789789 if1of ($(VBOX_LDR_FMT), pe lx)
    790790  VBoxDD2R0_LIBS          = \
    791         $(PATH_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
    792         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     791        $(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
     792        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    793793 endif
    794794
    … …  
    12291229  VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel
    12301230  VBoxPciRawR0_SOURCES  = Bus/DevPciRaw.cpp
    1231  
     1231
    12321232  Bus/DevPciRaw.cpp_INCS   = Bus
    12331233 endif

  • trunk/src/VBox/Disassembler/Makefile.kmk

    r28800 r38082  
    7474 tstDisasm_SOURCES      = DisasmTest.cpp DisasmTestA.asm
    7575 tstDisasm_LIBS         = \
    76         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB) \
     76        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \
    7777        $(LIB_RUNTIME)
    7878
    … …  
    8282 tstDisasmCore_SOURCES  = DisasmTestCore.cpp
    8383 tstDisasmCore_LIBS     = \
    84         $(PATH_LIB)/DisasmCoreR3$(VBOX_SUFF_LIB) \
     84        $(PATH_STAGE_LIB)/DisasmCoreR3$(VBOX_SUFF_LIB) \
    8585        $(LIB_RUNTIME)
    8686endif # VBOX_WITH_TESTCASES

  • trunk/src/VBox/Disassembler/testcase/Makefile.kmk

    r35381 r38082  
    2626        tstDisasm-2.cpp
    2727tstDisasm-2_LIBS        = \
    28         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB) \
     28        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB) \
    2929        $(LIB_RUNTIME)
    3030
    … …  
    5858        tstBin-5.bin \
    5959        tstBin-6.bin
    60 #       $(PATH_BIN)/testcase/tstDisasm-2$(SUFF_EXEC)
     60#       $(PATH_STAGE_BIN)/testcase/tstDisasm-2$(SUFF_EXEC)
    6161endif
    6262

  • trunk/src/VBox/Frontends/Common/VBoxKeyboard/Makefile.kmk

    r36222 r38082  
    2121if1of ($(KBUILD_TARGET), freebsd linux openbsd netbsd solaris) # X11
    2222 DLLS        += VBoxKeyboard
    23  OTHERS      += $(PATH_BIN)/vboxkeyboard.tar.bz2
    24  OTHER_CLEAN += $(PATH_BIN)/vboxkeyboard.tar.bz2
     23 OTHERS      += $(PATH_STAGE_BIN)/vboxkeyboard.tar.bz2
     24 OTHER_CLEAN += $(PATH_STAGE_BIN)/vboxkeyboard.tar.bz2
    2525endif
    2626
    … …  
    4545# but wtf, it's not like we're even trying to be FHS compliant).
    4646#
    47 ## @todo this should be tar'ed down into the output directory and installed using an install target.
    4847VBOX_KEYBOARD_STAGE_DIR = $(PATH_TARGET)/VBoxKeyboard/install
    4948VBOX_KEYBOARD_DEST_DIR = $(VBOX_KEYBOARD_STAGE_DIR)/VBoxKeyboard/
    5049
     50## @todo kBuild need support for copying files into _1_OUTDIR.
    5151INSTALLS += VBoxKeyboard-Files
    52 
    53 VBoxKeyboard-Files_INST    = $(subst $(PATH_TARGET),obj,$(VBOX_KEYBOARD_DEST_DIR))
    54 VBoxKeyboard-Files_MODE    = a+rx,u+w
    55 VBoxKeyboard-Files_SOURCES = \
     52VBoxKeyboard-Files_INSTTYPE = stage
     53VBoxKeyboard-Files_INST     = misc-staging/VBoxKeyboard/
     54VBoxKeyboard-Files_MODE     = a+r,u+w
     55VBoxKeyboard-Files_SOURCES  = \
    5656                COPYING.LIB \
    5757                keyboard.c \
    … …  
    6363                ../../../../../include/VBox/VBoxKeyboard.h=>VBox/VBoxKeyboard.h
    6464
    65 $(PATH_BIN)/vboxkeyboard.tar.bz2: \
    66                 $(INSTARGET_VBoxKeyboard-Files) \
    67                 $(MAKEFILE_CURRENT)
     65INSTALLS += VBoxKeyboard-Tarball
     66VBoxKeyboard-Tarball_INST    = $(INST_BIN)
     67VBoxKeyboard-Tarball_MODE    = a+r,u+w
     68VBoxKeyboard-Tarball_SOURCES = $(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2
     69VBoxKeyboard-Tarball_CLEAN   = $(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2
     70
     71$$(VBoxKeyboard-Tarball_0_OUTDIR)/vboxkeyboard.tar.bz2: \
     72                $$(INSTARGET_VBoxKeyboard-Files) \
     73                $(MAKEFILE_CURRENT) \
     74                | $$(dir $$@)
    6875        $(call MSG_L1,Packing $@)
    6976        $(QUIET)$(RM) -f -- $@ $(patsubst %.bz2,%,$@)
    70         $(QUIET)$(MKDIR) -p $(@D)
    7177ifdef VBOX_GTAR
    7278        $(QUIET)$(VBOX_GTAR) --owner 0 --group 0 --ignore-failed-read -cjRf $@ \
    73                 -C $(VBOX_KEYBOARD_STAGE_DIR) VBoxKeyboard
     79                -C $(PATH_STAGE)/$(VBoxKeyboard-Files_INST).. VBoxKeyboard
    7480else
    7581        $(QUIET)tar -cjf $@ \
    76                 -C $(VBOX_KEYBOARD_STAGE_DIR) VBoxKeyboard
     82                -C $(PATH_STAGE)/$(VBoxKeyboard-Files_INST).. VBoxKeyboard
    7783endif
    7884        $(QUIET)$(CHMOD) 0644 $@
    7985
     86
     87
    8088include $(KBUILD_PATH)/subfooter.kmk
     89
     90

  • trunk/src/VBox/Frontends/VBoxSDL/Makefile.kmk

    r37037 r38082  
    8282ifeq ($(filter-out freebsd linux netbsd openbsd solaris,$(KBUILD_TARGET)),) # X11
    8383VBoxSDL_LIBS += \
    84         $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \
     84        $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) \
    8585        $(VBOX_XCURSOR_LIBS) \
    8686        X11

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r38002 r38082  
    252252        $(PATH_SDK_DXSDK_LIB)/dxguid.lib
    253253if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) # X11
    254  VirtualBox_LIBS         += $(PATH_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
     254 VirtualBox_LIBS         += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL)
    255255endif
    256256

  • trunk/src/VBox/HostDrivers/Support/Makefile.kmk

    r38004 r38082  
    200200        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
    201201        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
    202         $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
     202        $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    203203
    204204
    … …  
    245245        $(PATH_SUB_CURRENT) \
    246246        $(PATH_ROOT)/src/VBox/Runtime/r0drv/linux
    247 vboxdrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
     247vboxdrv_LIBS          = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    248248vboxdrv_LIBS.debug    = $(vboxdrv_LIBS) $(VBOX_GCC_LIBGCC)
    249249vboxdrv_SOURCES       = \
    … …  
    320320VBoxDrv_DEFS.debug  = DEBUG_DARWIN_GIP
    321321VBoxDrv_INCS        = . $(VBoxDrv_0_OUTDIR)
    322 VBoxDrv_LIBS        = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
     322VBoxDrv_LIBS        = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    323323#VBoxDrv_LDFLAGS     = -v -Wl,-whyload -Wl,-v -Wl,-whatsloaded
    324324VBoxDrv_SOURCES     = \
    … …  
    379379VBoxDrv_LIBS          = \
    380380        $(VBoxDrvLib_1_TARGET) \
    381         $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
     381        $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
    382382        $(VBOX_GCC_LIBGCC) \
    383383        end
    … …  
    405405vboxdrv_DEFS          = IN_RT_R0 IN_SUP_R0 SUPDRV_WITH_RELEASE_LOGGER VBOX_SVN_REV=$(VBOX_SVN_REV)
    406406vboxdrv_INCS         := $(PATH_SUB_CURRENT)
    407 vboxdrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
     407vboxdrv_LIBS          = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    408408vboxdrv_SOURCES      := \
    409409        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).c \
    … …  
    451451vboxdrv_DEPS         += $(VBOX_SVN_REV_KMK)
    452452vboxdrv_INCS         := $(PATH_SUB_CURRENT)
    453 vboxdrv_LIBS          = $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
     453vboxdrv_LIBS          = $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    454454vboxdrv_SOURCES       = \
    455455        $(KBUILD_TARGET)/SUPDrv-$(KBUILD_TARGET).c \

  • trunk/src/VBox/HostDrivers/VBoxNetAdp/Makefile.kmk

    r35380 r38082  
    5757#       VBoxNetAdp.c
    5858VBoxNetAdp_LIBS            += \
    59         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
     59        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
    6060 endif
    6161endif

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

    r37982 r38082  
    6161        $(PATH_SDK_WINDDKWLH_LIB)/hal.lib \
    6262        $(PATH_SDK_WINDDKWLH_LIB)/ndis.lib \
    63         $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
     63        $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    6464VBoxNetFlt_LIBS = \
    65         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
     65        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
    6666
    6767darwin/VBoxNetFlt-darwin.cpp_DEFS = VBOX_SVN_REV=$(VBOX_SVN_REV)
    … …  
    279279        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
    280280        $(PATH_SDK_W2K3DDK_LIB)/ndis.lib \
    281         $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
     281        $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    282282VBoxNetAdp_LIBS = \
    283         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
     283        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
    284284
    285285
    … …  
    333333vboxnetflt_LDFLAGS.solaris += -N drv/vboxdrv -N misc/ctf
    334334vboxnetflt_LIBS = \
    335         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
     335        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
    336336## @todo vboxflt should resolves all the IPRT bits from vboxdrv.
    337337#vboxnetflt_LIBS += \
    338 #       $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
     338#       $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB)
    339339vboxnetflt_SOURCES.linux = linux/VBoxNetFlt-linux.c
    340340vboxnetflt_SOURCES.solaris = solaris/VBoxNetFlt-solaris.c
    … …  
    351351vboxnetbow_LDFLAGS      += -N drv/vboxdrv -N drv/vnic -N misc/mac -N misc/dls
    352352vboxnetbow_LIBS = \
    353         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
     353        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
    354354vboxnetbow_SOURCES.solaris = solaris/VBoxNetFltBow-solaris.c
    355355vboxnetbow_SOURCES         = VBoxNetFlt.c

  • trunk/src/VBox/HostDrivers/VBoxPci/Makefile.kmk

    r35920 r38082  
    2222VBoxPci_SOURCES          =
    2323VBoxPci_LIBS            += \
    24         $(PATH_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
     24        $(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
    2525
    2626endif

  • trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk

    r37801 r38082  
    5252        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
    5353        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
    54         $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
     54        $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
    5555        $(usbd_1_TARGET)
    5656
    … …  
    8484        $(PATH_SDK_W2K3DDK_LIB)/ntoskrnl.lib \
    8585        $(PATH_SDK_W2K3DDK_LIB)/hal.lib \
    86         $(PATH_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
     86        $(PATH_STAGE_LIB)/RuntimeR0Drv$(VBOX_SUFF_LIB) \
    8787        $(usbd_1_TARGET)
    8888
    … …  
    100100        $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \
    101101        $(LIB_RUNTIME) \
    102         $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \
     102        $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) \
    103103        $(VBoxDrvCfg_1_TARGET)
    104104
    … …  
    117117        $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \
    118118        $(LIB_RUNTIME) \
    119         $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \
     119        $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) \
    120120    $(VBoxDrvCfg_1_TARGET)
    121121
    … …  
    133133        $(PATH_SDK_W2K3DDK_LIB)/newdev.lib \
    134134        $(LIB_RUNTIME) \
    135         $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB) \
     135        $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB) \
    136136        $(VBoxDrvCfg_1_TARGET)
    137137

  • trunk/src/VBox/HostServices/SharedOpenGL/Makefile.kmk

    r37332 r38082  
    6565VBoxSharedCrOpenGL_LDFLAGS.darwin = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxSharedCrOpenGL.dylib
    6666VBoxSharedCrOpenGL_LIBS = \
    67         $(PATH_LIB)/VBoxOGLcrserverlib$(VBOX_SUFF_LIB) \
    68         $(PATH_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \
    69         $(PATH_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \
    70         $(PATH_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
    71         $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
     67        $(PATH_STAGE_LIB)/VBoxOGLcrserverlib$(VBOX_SUFF_LIB) \
     68        $(PATH_STAGE_LIB)/VBoxOGLhostcrstate$(VBOX_SUFF_LIB) \
     69        $(PATH_STAGE_LIB)/VBoxOGLcrunpacker$(VBOX_SUFF_LIB) \
     70        $(PATH_STAGE_LIB)/VBoxOGLhostcrpacker$(VBOX_SUFF_LIB) \
     71        $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    7272        $(VBOX_LIB_OGL_HOSTCRUTIL) \
    73         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
     73        $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
    7474        $(LIB_RUNTIME) \
    7575        $(LIB_VMM)
    … …  
    8282else
    8383 VBoxSharedCrOpenGL_LIBS += \
    84         $(PATH_BIN)/VBoxOGLrenderspu$(VBOX_SUFF_DLL)
     84        $(PATH_STAGE_BIN)/VBoxOGLrenderspu$(VBOX_SUFF_DLL)
    8585endif
    8686ifdef VBOX_WITH_XPCOM
    … …  
    259259VBoxOGLrenderspu_LDFLAGS.darwin += -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxOGLrenderspu.dylib
    260260VBoxOGLrenderspu_LIBS = \
    261         $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
     261        $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    262262        $(VBOX_LIB_OGL_HOSTCRUTIL) \
    263263        $(LIB_RUNTIME)

  • trunk/src/VBox/Installer/Makefile.kmk

    r28800 r38082  
    4646 # Package the VirtualBox SDK.
    4747 #
    48  VBOX_SDK_ZIP  = $(PATH_BIN)/VirtualBoxSDK-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).zip
     48 VBOX_SDK_ZIP  = $(PATH_STAGE_BIN)/VirtualBoxSDK-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).zip
    4949 PACKING      += $(VBOX_SDK_ZIP)
    5050 OTHER_CLEANS += $(VBOX_SDK_ZIP) \
    51                  $(wildcard $(PATH_BIN)/VirtualBoxSDK-*-r*.zip)
     51                 $(wildcard $(PATH_STAGE_BIN)/VirtualBoxSDK-*-r*.zip)
    5252
    5353 VBOX_ZIP     ?= zip
    5454# @todo: wrong, it must depend on everything included in SDK
    5555$(VBOX_SDK_ZIP): \
    56                 $(PATH_BIN)/sdk \
     56                $(PATH_STAGE_BIN)/sdk \
    5757                $(VBOX_VERSION_STAMP)
    5858        $(call MSG_L1,Making SDK delivery $@)
    59         $(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_BIN) -- $(VBOX_ZIP) -r9 $@ sdk
     59        $(QUIET)$(REDIRECT) $(if $(QUIET),-wo /dev/null,) -C $(PATH_STAGE_BIN) -- $(VBOX_ZIP) -r9 $@ sdk
    6060endif
    6161

  • trunk/src/VBox/Installer/freebsd/Makefile.kmk

    r35380 r38082  
    4343
    4444BLDDIRS  += $(VBOX_FBSD_INST_OUT_DIR) $(VBOX_FBSD_INST_STAGE_DIR)
    45 PACKING  += $(PATH_BIN)/$(VBOX_FBSD_PACKAGE_NAME)
     45PACKING  += $(PATH_STAGE_BIN)/$(VBOX_FBSD_PACKAGE_NAME)
    4646
    4747OTHER_CLEAN   += \
    … …  
    154154 VBOX_FBSD_NO_STRIP += \
    155155        $(VBOX_LICENSE_FILES) \
    156         $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/lib*VBox*)),) \
     156        $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \
    157157        $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \
    158158        $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm)
    … …  
    231231# The module source archive
    232232#
    233 $(PATH_BIN)/vboxdrv.tar.gz: \
     233$(PATH_STAGE_BIN)/vboxdrv.tar.gz: \
    234234                src
    235235        $(call MSG_TOOL, export_modules,,$@)
    236         $(QUIET)$(PATH_BIN)/export_modules $@
     236        $(QUIET)$(PATH_STAGE_BIN)/export_modules $@
    237237
    238238#
    … …  
    240240# @todo r=aeichner: Create pkg_plist dynamically based on the available features
    241241#
    242 $(PATH_BIN)/$(VBOX_FBSD_PACKAGE_NAME): \
     242$(PATH_STAGE_BIN)/$(VBOX_FBSD_PACKAGE_NAME): \
    243243                $(VBOX_VERSION_STAMP) \
    244244                $(VBOX_FBSD_INST_OUT_DIR)/pkg_plist \
    … …  
    264264
    265265$(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_STRIP_BIN)): \
    266                 $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_BIN)/%
     266                $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
    267267        $(call MSG_INST_FILE,$<,$@)
    268268        $(QUIET)$(INSTALL) -d $(dir $@)
    … …  
    271271# pattern rule for striping and copying the VBOX_FBSD_STRIP_OBJ files to install/lib/virtualbox
    272272$(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_STRIP_OBJ)): \
    273                 $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_BIN)/%
     273                $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
    274274        $(call MSG_INST_FILE,$<,$@)
    275275        $(QUIET)$(INSTALL) -d $(dir $@)
    … …  
    284284# pattern rule for linking the VBOX_FBSD_NO_STRIP into lib/virtualbox/
    285285$(addprefix $(VBOX_FBSD_INST_LIBVBOX_DIR)/,$(VBOX_FBSD_NO_STRIP)): \
    286                 $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_BIN)/%
     286                $(VBOX_FBSD_INST_LIBVBOX_DIR)/% : $(PATH_STAGE_BIN)/%
    287287        $(call MSG_INST_FILE,$<,$@)
    288288        $(QUIET)$(INSTALL) -d $(dir $@)
    … …  
    292292# pattern rule for symlinking the VBOX_FBSD_SYMLINKS into bin/
    293293$(addprefix $(VBOX_FBSD_INST_BIN_DIR)/,$(VBOX_FBSD_SYMLINKS)): \
    294                 $(VBOX_FBSD_INST_BIN_DIR)/% : $(PATH_BIN)/%
     294                $(VBOX_FBSD_INST_BIN_DIR)/% : $(PATH_STAGE_BIN)/%
    295295        $(call MSG_INST_SYM,$<,$@)
    296296        $(QUIET)$(INSTALL) -d $(dir $@)
    … …  
    300300# pattern rule for copying the VBOX_FBSD_DESKTOP_FILE into share/applications/
    301301$(addprefix $(VBOX_FBSD_INST_SHAREAPP_DIR)/,$(VBOX_FBSD_DESKTOP_FILE)): \
    302                 $(VBOX_FBSD_INST_SHAREAPP_DIR)/% : $(PATH_BIN)/%
     302                $(VBOX_FBSD_INST_SHAREAPP_DIR)/% : $(PATH_STAGE_BIN)/%
    303303        $(call MSG_INST_FILE,$<,$@)
    304304        $(QUIET)$(INSTALL) -d $(dir $@)
    … …  
    308308# pattern rule for copying the VBOX_FBSD_ICON_FILE into share/pixmaps/
    309309$(addprefix $(VBOX_FBSD_INST_SHAREICON_DIR)/,$(VBOX_FBSD_ICON_FILE)): \
    310                 $(VBOX_FBSD_INST_SHAREICON_DIR)/% : $(PATH_BIN)/%
     310                $(VBOX_FBSD_INST_SHAREICON_DIR)/% : $(PATH_STAGE_BIN)/%
    311311        $(call MSG_INST_FILE,$<,$@)
    312312        $(QUIET)$(INSTALL) -d $(dir $@)

  • trunk/src/VBox/Installer/linux/Makefile.kmk

    r38001 r38082  
    4141
    4242BLDDIRS  += $(VBOX_LNX_INST_OUT_DIR) $(VBOX_LNX_INST_STAGE_DIR)
    43 PACKING  += $(PATH_BIN)/VirtualBox.tar.bz2
     43PACKING  += $(PATH_STAGE_BIN)/VirtualBox.tar.bz2
    4444if !defined(VBOX_NO_LINUX_RUN_INSTALLER)
    45  PACKING += $(PATH_BIN)/$(VBOX_LNX_PACKAGE_NAME) \
    46             $(PATH_BIN)/VirtualBox-dbg.tar.bz2
     45 PACKING += $(PATH_STAGE_BIN)/$(VBOX_LNX_PACKAGE_NAME) \
     46            $(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2
    4747endif
    4848
    … …  
    142142                VBoxTestOGL \
    143143                VBoxSharedCrOpenGL.so,) \
    144         $(if $(VBOX_WITH_PYTHON),$(notdir $(wildcard $(PATH_BIN)/VBoxPython*.so)),) \
     144        $(if $(VBOX_WITH_PYTHON),$(notdir $(wildcard $(PATH_STAGE_BIN)/VBoxPython*.so)),) \
    145145        $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \
    146146        VBoxTunctl
    … …  
    184184        virtualbox.xml \
    185185        $(VBOX_LICENSE_FILES) \
    186         $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/lib*VBox*)),) \
     186        $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_STAGE_BIN)/lib*VBox*)),) \
    187187        $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \
    188188        $(foreach f,$(VBOX_APPROVED_GUI_LANGUAGES),nls/VirtualBox_$(f).qm nls/qt_$(f).qm) \
    … …  
    234234ifdef VBOX_WITH_PYTHON
    235235 VBOX_LNX_NO_STRIP += \
    236         $(foreach f,$(notdir $(wildcard $(PATH_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \
     236        $(foreach f,$(notdir $(wildcard $(PATH_STAGE_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \
    237237        sdk/bindings/xpcom/python/xpcom/client/__init__.py \
    238238        sdk/bindings/xpcom/python/xpcom/server/__init__.py \
    … …  
    305305# The generic installer.
    306306#
    307 $(PATH_BIN)/$(VBOX_LNX_PACKAGE_NAME): \
     307$(PATH_STAGE_BIN)/$(VBOX_LNX_PACKAGE_NAME): \
    308308                $(VBOX_LNX_INST_STAGE_DIR)/VirtualBox.tar.bz2 \
    309309                $(VBOX_VERSION_STAMP) \
    … …  
    319319                $(VBOX_PATH_LNX_INST_SRC)/uninstall.sh
    320320        $(call MSG_TOOL,makeself,,$@)
    321         $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/VirtualBox-*.run)
     321        $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/VirtualBox-*.run)
    322322        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LNX_INST_SRC)/routines.sh          $(VBOX_LNX_INST_STAGE_DIR)/
    323323        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LNX_INST_SRC)/deffiles             $(VBOX_LNX_INST_STAGE_DIR)/
    … …  
    383383        $(VBOX_LNX_INST_DEP_ON_MAKEFILE) \
    384384        $(VBOX_VERSION_STAMP) \
    385         $(wildcard $(PATH_BIN)/src/*) \
    386         $(wildcard $(PATH_BIN)/src/*/*) \
    387         $(wildcard $(PATH_BIN)/src/*/*/*) \
    388         $(wildcard $(PATH_BIN)/src/*/*/*/*)
     385        $(wildcard $(PATH_STAGE_BIN)/src/*) \
     386        $(wildcard $(PATH_STAGE_BIN)/src/*/*) \
     387        $(wildcard $(PATH_STAGE_BIN)/src/*/*/*) \
     388        $(wildcard $(PATH_STAGE_BIN)/src/*/*/*/*)
    389389
    390390
    … …  
    407407# .tar.bz2 for distribution with the files under VirtualBox-<ver>/.
    408408#
    409 $(PATH_BIN)/VirtualBox.tar.bz2: $(VBOX_LNX_INST_ARCH_DEPS)
     409$(PATH_STAGE_BIN)/VirtualBox.tar.bz2: $(VBOX_LNX_INST_ARCH_DEPS)
    410410        $(call MSG_L1,Packing $@)
    411411        $(QUIET)$(RM) -f -- $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-$(VBOX_VERSION_STRING) $@ $(patsubst %.bz2,%,$@)
    … …  
    424424# pattern rule for stripping and copying the VBOX_LNX_STRIP_BIN files to archive/
    425425$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_BIN)): \
    426                 $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_BIN)/% \
     426                $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% \
    427427                $(if $(VBOX_NO_LINUX_RUN_INSTALLER),,\
    428428                    $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/%) \
    … …  
    434434# pattern rule for striping and copying the VBOX_LNX_STRIP_OBJ files to archive/
    435435$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_STRIP_OBJ)): \
    436                 $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_BIN)/% | $$(dir $$@)
     436                $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
    437437        $(call MSG_INST_FILE,$<,$@)
    438438ifeq ($(VBOX_DO_STRIP),)
    … …  
    445445
    446446# special rule for the kernel modules
    447 $(VBOX_LNX_INST_OUT_DIR)/archive/src: $(PATH_BIN)/src | $(dir $@)
     447$(VBOX_LNX_INST_OUT_DIR)/archive/src: $(PATH_STAGE_BIN)/src | $(dir $@)
    448448        $(call MSG_INST_SYM,$<,$@)
    449449        $(QUIET)$(RM) -Rf $@
    … …  
    453453# pattern rule for linking the VBOX_LNX_NO_STRIP into archive/
    454454$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive/,$(VBOX_LNX_NO_STRIP)): \
    455                 $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_BIN)/% | $$(dir $$@)
     455                $(VBOX_LNX_INST_OUT_DIR)/archive/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
    456456        $(call MSG_INST_SYM,$<,$@)
    457457        $(QUIET)$(RM) -f $@
    … …  
    480480# .tar.bz2 for with the debug info.
    481481#
    482 $(PATH_BIN)/VirtualBox-dbg.tar.bz2: \
     482$(PATH_STAGE_BIN)/VirtualBox-dbg.tar.bz2: \
    483483                $(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/, $(VBOX_LNX_STRIP_BIN))
    484484        $(call MSG_L1,Packing $@)
    … …  
    495495# pattern rule for copying the debug info from the VBOX_LNX_STRIP_BIN files into archive-dbg/$(VBOX_LNX_DBG_PATH)/
    496496$(addprefix $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/,$(VBOX_LNX_STRIP_BIN)): \
    497                 $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/% : $(PATH_BIN)/% | $$(dir $$@)
     497                $(VBOX_LNX_INST_OUT_DIR)/archive-dbg/$(VBOX_LNX_DBG_PATH)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
    498498        $(call MSG_TOOL,copydbg,$<,$@)
    499499        $(QUIET)objcopy --only-keep-debug $< $@

  • trunk/src/VBox/Installer/solaris/Makefile.kmk

    r37549 r38082  
    5757SOLARIS_OUT_BIN_64         := $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin
    5858SOLARIS_OUT_BIN_32         := $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin
    59 SOLARIS_OUT_BIN            := $(PATH_BIN)
     59SOLARIS_OUT_BIN            := $(PATH_STAGE_BIN)
    6060
    6161SOLARIS_DBG_DIR            := $(PATH_TARGET)/Installer/DebugPkg
    … …  
    121121)
    122122
    123 PACKING          += $(PATH_BIN)/$(PKG_FILENAME).tar.gz $(PATH_BIN)/$(DBG_ARCHIVE)
     123PACKING          += $(PATH_STAGE_BIN)/$(PKG_FILENAME).tar.gz $(PATH_STAGE_BIN)/$(DBG_ARCHIVE)
    124124
    125125OTHER_CLEAN      += $(addprefix $(SOLARIS_BASEINST_DIR)/,\
    … …  
    308308        $(if $(VBOX_WITH_WEBSERVICES),smf-vboxwebsrv.sh,)
    309309
    310 # Things packed explicitly, not from $(PATH_BIN), track these to clean-up properly
     310# Things packed explicitly, not from $(PATH_STAGE_BIN), track these to clean-up properly
    311311SOLARIS_EXTRAS = \
    312312        LICENSE \
    … …  
    352352ifdef VBOX_WITH_PYTHON
    353353  SOLARIS_COMMON += \
    354         $(foreach f,$(notdir $(wildcard $(PATH_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \
     354        $(foreach f,$(notdir $(wildcard $(PATH_STAGE_BIN)/sdk/bindings/xpcom/python/xpcom/*.py)),sdk/bindings/xpcom/python/xpcom/$(f)) \
    355355        sdk/bindings/xpcom/python/xpcom/client/__init__.py \
    356356        sdk/bindings/xpcom/python/xpcom/server/__init__.py \
    … …  
    536536#                invoking $(MAKE) vbox_copy_sdk_files (or similar) to do the copying after $(RM) -Rf the
    537537#                directory tree.
    538 $(PATH_BIN)/$(PKG_FILENAME).tar.gz: \
     538$(PATH_STAGE_BIN)/$(PKG_FILENAME).tar.gz: \
    539539                $(VBOX_VERSION_STAMP) \
    540540                $(VBOX_PATH_SOL_INST_SRC)/makepackage.sh \
    … …  
    552552                $(if $(VBOX_WITH_SOLARIS_VBI),$(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg,) \
    553553                $(VBOX_BRAND_LICENSE_TXT) \
    554                 $(PATH_BIN)/LICENSE \
     554                $(PATH_STAGE_BIN)/LICENSE \
    555555                $(if $(and $(VBOX_LICENSE_BINS),$(VBOX_WITH_QTGUI)),$(VBOX_LICENSE_BINS),) \
    556556                $(if $(VBOX_WITH_NETADP),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0,) \
    557557                $(if $(not $(VBOX_WITH_NETFLT))$(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicinit_solaris.sh,) \
    558558                $(if $(not $(VBOX_WITH_NETFLT))$(PATH_ROOT)/src/VBox/Devices/Network/solaris/vnicterm_solaris.sh,) \
    559                 $(addprefix $(PATH_BIN)/,$(filter-out $(SOLARIS_EXTRAS) $(SOLARIS_QTLIBS),$(SOLARIS_ARCH_FILES))) \
     559                $(addprefix $(PATH_STAGE_BIN)/,$(filter-out $(SOLARIS_EXTRAS) $(SOLARIS_QTLIBS),$(SOLARIS_ARCH_FILES))) \
    560560                VBoxISAExec \
    561561                $(SOLARIS_ARCH_DEPFILES)
    562         $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/VirtualBox-*-r*.tar.gz)
     562        $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/VirtualBox-*-r*.tar.gz)
    563563        $(call MSG_L1,Installing binaries $(SOLARIS_VBOXINST_DIR))
    564564ifdef VBOX_WITH_COMBINED_PACKAGE
    … …  
    586586        $(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_PIXMAPS_DIR)
    587587        $(QUIET)$(if $(VBOX_WITH_NETADP),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0    $(SOLARIS_ETC_DIR)/hostname.vboxnet0,)
    588         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                                          $(SOLARIS_VBOXINST_DIR)/LICENSE
     588        $(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE                                                          $(SOLARIS_VBOXINST_DIR)/LICENSE
    589589        # don't display the license on package install, since 4.0
    590         #$(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                                          $(SOLARIS_BASEINST_DIR)/vbox.copyright
    591         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                                          $(SOLARIS_BASEINST_DIR)/LICENSE
     590        #$(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE                                                          $(SOLARIS_BASEINST_DIR)/vbox.copyright
     591        $(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE                                                          $(SOLARIS_BASEINST_DIR)/LICENSE
    592592ifdef VBOX_WITH_COMBINED_PACKAGE
    593593 ifndef VBOX_OSE
    … …  
    630630                -e "s/_HARDENED_/$(if $(VBOX_WITH_HARDENED),hardened,)/" \
    631631                --output $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp \
    632                  $(PATH_BIN)/vboxconfig.sh
     632                 $(PATH_STAGE_BIN)/vboxconfig.sh
    633633        $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp                                    $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh
    634634        $(QUIET)$(RM) -f $(SOLARIS_VBOXINST_DIR)/vboxconfig.sh.tmp
    … …  
    759759#
    760760$(addprefix $(SOLARIS_VBOXINST_DIR)/,$(SOLARIS_COMMON)): \
    761                 $(SOLARIS_VBOXINST_DIR)/% : $(PATH_BIN)/% | $$(dir $$@)
     761                $(SOLARIS_VBOXINST_DIR)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
    762762        $(INSTALL) -m 0644 $< $@
    763763
    764764# Driver configuration files
    765765$(addprefix $(SOLARIS_DRIVERINST_DIR)/,$(SOLARIS_DRIVER_CONFS)): \
    766                 $(SOLARIS_DRIVERINST_DIR)/% : $(PATH_BIN)/% | $$(dir $$@)
     766                $(SOLARIS_DRIVERINST_DIR)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
    767767        $(INSTALL) -m 0644 $< $@
    768768
    769769# Common executables
    770770$(addprefix $(SOLARIS_VBOXINST_DIR)/,$(SOLARIS_COMMON_EXES)): \
    771                 $(SOLARIS_VBOXINST_DIR)/% : $(PATH_BIN)/% | $$(dir $$@)
     771                $(SOLARIS_VBOXINST_DIR)/% : $(PATH_STAGE_BIN)/% | $$(dir $$@)
    772772        $(INSTALL) -m 0755 $< $@
    773773
    774774# Common MIME icons
    775775$(addprefix $(SOLARIS_USRSHR_ICONS_DIR)/,$(SOLARIS_COMMON_ICONS)): \
    776                 $(SOLARIS_USRSHR_ICONS_DIR)/% : $(PATH_BIN)/icons/% | $$(dir $$@)
     776                $(SOLARIS_USRSHR_ICONS_DIR)/% : $(PATH_STAGE_BIN)/icons/% | $$(dir $$@)
    777777        $(INSTALL) -m 0644 $< $@
    778778
    … …  
    782782# Common (relative symlinks to /opt/VirtualBox/ from /usr/bin/)
    783783# Some symlinks are created manually in the prepackage steps above (eg. VBoxQtconfig)
    784 # as those binaries do not originate from $(PATH_BIN)
     784# as those binaries do not originate from $(PATH_STAGE_BIN)
    785785#
    786786$(addprefix $(SOLARIS_USRBIN_DIR)/,$(SOLARIS_USRBIN_LINKS)): \
    … …  
    796796                $(VBOX_VERSION_STAMP) \
    797797                $(VBOX_BRAND_LICENSE_TXT) \
    798                 $(PATH_BIN)/LICENSE \
     798                $(PATH_STAGE_BIN)/LICENSE \
    799799                $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo \
    800800                $(VBOX_PATH_SOL_INST_SRC)/vbi/makepackage.sh \
    … …  
    817817                $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo
    818818        # don't display the license on package install, since 4.0
    819         #$(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                                          $(SOLARIS_VBI_DIR)/vbox.copyright
     819        #$(QUIET)$(INSTALL) -m 0644 $(PATH_STAGE_BIN)/LICENSE                                                          $(SOLARIS_VBI_DIR)/vbox.copyright
    820820        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/vbi/makepackage.sh                                 $(SOLARIS_VBI_DIR)/makepackage.sh
    821821        $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/vbi/preremove.sh                                   $(SOLARIS_VBI_DIR)/preremove.sh
    … …  
    828828#  -=-=-=-=-=-=-=- Debug package -=-=-=-=-=-=-=-
    829829#
    830 $(PATH_BIN)/$(DBG_ARCHIVE): \
     830$(PATH_STAGE_BIN)/$(DBG_ARCHIVE): \
    831831                $(VBOX_VERSION_STAMP) \
    832832                $(VBOX_PATH_SOL_INST_SRC)/Makefile.kmk \
    … …  
    834834        $(call MSG_L1,Installing debug binaries $(SOLARIS_DBG_DIR))
    835835        $(call MSG_L1,Packing $@)
    836         $(QUIET)/usr/sfw/bin/gtar --owner 0 --group 0 -cjRhf $(PATH_BIN)/$(DBG_ARCHIVE) -C $(SOLARIS_DBG_DIR) $(SOLARIS_DBG_DEPFILES)
     836        $(QUIET)/usr/sfw/bin/gtar --owner 0 --group 0 -cjRhf $(PATH_STAGE_BIN)/$(DBG_ARCHIVE) -C $(SOLARIS_DBG_DIR) $(SOLARIS_DBG_DEPFILES)
    837837        $(QUIET)$(CHMOD) 0644 $@
    838838

  • trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

    r37053 r38082  
    3838ifdef VBOX_WITH_NETFLT
    3939 VBoxInstallHelper_LIBS   += \
    40         $(PATH_LIB)/WinNetConfig.lib \
    41         $(PATH_LIB)/VBoxDrvCfg.lib \
     40        $(PATH_STAGE_LIB)/WinNetConfig.lib \
     41        $(PATH_STAGE_LIB)/VBoxDrvCfg.lib \
    4242        $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
    4343        $(PATH_SDK_WINPSDK_LIB)/WbemUuid.Lib

  • trunk/src/VBox/Installer/win/Makefile.kmk

    r37622 r38082  
    7070PACKAGE_BASE                := VirtualBox-$(VBOX_VERSION_STRING)
    7171PACKAGE_NAME_LANG           := $(PACKAGE_BASE)-r$(VBOX_SVN_REV)
    72 PACKAGE_NAME_FINAL          := $(PATH_BIN)/$(PACKAGE_NAME_LANG).msi
     72PACKAGE_NAME_FINAL          := $(PATH_STAGE_BIN)/$(PACKAGE_NAME_LANG).msi
    7373
    7474ifdef VBOX_WITH_COMBINED_PACKAGE
    … …  
    8585 PACKING += $(PACKAGE_NAME_FINAL)
    8686 ifeq ($(KBUILD_TARGET_ARCH),x86)
    87   PACKING += $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)
     87  PACKING += $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)
    8888 endif
    8989else
    … …  
    113113 ifeq ($(KBUILD_TARGET_ARCH),x86)
    114114  OTHER_CLEAN += \
    115         $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \
     115        $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL) \
    116116        $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \
    117117        $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.am64) \
    … …  
    138138 endif
    139139
    140  VBOX_PATH_PACK_BUNDLE_TMP = $(PATH_BIN)/VBoxWinBundleInstaller
    141  VBOX_PATH_PACK_BUNDLE_ZIP = $(PATH_BIN)/VBoxWinBundleInstaller-$(KBUILD_TARGET_ARCH).zip
     140 VBOX_PATH_PACK_BUNDLE_TMP = $(PATH_STAGE_BIN)/VBoxWinBundleInstaller
     141 VBOX_PATH_PACK_BUNDLE_ZIP = $(PATH_STAGE_BIN)/VBoxWinBundleInstaller-$(KBUILD_TARGET_ARCH).zip
    142142
    143143 VBOX_BRAND_WIN_INST_NAME.x86   = $(PACKAGE_BASE)-Win_x86$(VBOX_BRAND_WIN_INST_EXT).msi
    … …  
    220220        $(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
    221221  ifdef VBOX_WITH_DOCS_CHM
    222                 $(APPEND) $@ '  <File Id="file_VirtualBox.chm" Name="VirtualBox.chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/VirtualBox.chm"></File>'
     222                $(APPEND) $@ '  <File Id="file_VirtualBox.chm" Name="VirtualBox.chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_STAGE_BIN)/VirtualBox.chm"></File>'
    223223                $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
    224                              '  <File Id="file_VirtualBox_$(lang).chm" Name="VirtualBox_$(lang).chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/VirtualBox_$(lang).chm"></File>')
     224                             '  <File Id="file_VirtualBox_$(lang).chm" Name="VirtualBox_$(lang).chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_STAGE_BIN)/VirtualBox_$(lang).chm"></File>')
    225225  endif
    226226        $(APPEND) $@ '</Include>'
    … …  
    230230        $(APPEND) -t $@ '<?xml version="1.0" ?>'
    231231        $(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
    232         $(APPEND) $@ '  <File Id="file_UserManual.pdf" Name="UserManual.pdf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/UserManual.pdf">'
     232        $(APPEND) $@ '  <File Id="file_UserManual.pdf" Name="UserManual.pdf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_STAGE_BIN)/UserManual.pdf">'
    233233        $(APPEND) $@ '  </File>'
    234234        $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
    235                      '  <File Id="file_UserManual_$(lang).pdf" Name="UserManual_$(lang).pdf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/UserManual_$(lang).pdf">' \
     235                     '  <File Id="file_UserManual_$(lang).pdf" Name="UserManual_$(lang).pdf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_STAGE_BIN)/UserManual_$(lang).pdf">' \
    236236                     '  </File>')
    237237        $(APPEND) $@ '</Include>'
    … …  
    288288                $(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl \
    289289                $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \
    290                 $(PATH_BIN)/VBoxInstallHelper.dll \
     290                $(PATH_STAGE_BIN)/VBoxInstallHelper.dll \
    291291                $(MAKEFILE_CURRENT) \
    292292                | $$$$(dir $$$$@)
    … …  
    551551                $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst) \
    552552                | $$(dir $$@)
    553         $(QUIET)$(RM) -f $(wildcard $(PATH_BIN)/$(PACKAGE_BASE)-r*.msi)
     553        $(QUIET)$(RM) -f $(wildcard $(PATH_STAGE_BIN)/$(PACKAGE_BASE)-r*.msi)
    554554        $(REDIRECT) -C $(@D) -- \
    555555                wscript.exe $(VBOX_PATH_WISUMINFO) $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_en_US.msi $(VBOX_INS_PROD_LANG)
    … …  
    564564# need to do this once; so do it on x86 only.
    565565#
    566 $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL): \
     566$(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL): \
    567567                $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.x86) \
    568568                $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64)
    … …  
    574574                        -target-amd64 $(PATH_MULTIARCH_TEMP)/$(PACKAGE_NAME_MULTIARCH.amd64) \
    575575                        -target-all $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_MULTIARCH_COMMONCAB) \
    576                         -stub $(PATH_BIN)/VBoxStub.exe
     576                        -stub $(PATH_STAGE_BIN)/VBoxStub.exe
    577577        $(call VBOX_SIGN_FILE_FN,$@)
    578578endif
    … …  
    585585                $(PACKAGE_NAME_FINAL) \
    586586                $(if-expr "$(KBUILD_TARGET_ARCH)" == "x86", \
    587                         $(PATH_BIN)/VBoxBundleMachine.exe \
    588                         $(if $(VBOX_BRAND_WIN_AS_MENU), $(PATH_BIN)/AutoStartMenu.exe) \
    589                         $(if $(VBOX_WITH_COMBINED_PACKAGE), $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)),)
     587                        $(PATH_STAGE_BIN)/VBoxBundleMachine.exe \
     588                        $(if $(VBOX_BRAND_WIN_AS_MENU), $(PATH_STAGE_BIN)/AutoStartMenu.exe) \
     589                        $(if $(VBOX_WITH_COMBINED_PACKAGE), $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)),)
    590590        $(RM) -Rf -- $(VBOX_PATH_PACK_BUNDLE_TMP)/
    591591        $(MKDIR) -p $(VBOX_PATH_PACK_BUNDLE_TMP)/
    … …  
    595595ifeq ($(KBUILD_TARGET_ARCH),x86)
    596596 ifdef VBOX_WITH_COMBINED_PACKAGE
    597         $(CP) $(PATH_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)       $(VBOX_PATH_PACK_BUNDLE_TMP)/$(PACKAGE_NAME_MULTIARCH_FINAL)
    598  endif
    599         $(CP) $(PATH_BIN)/VBoxBundleMachine.exe     $(VBOX_PATH_PACK_BUNDLE_TMP)/
    600         $(CP) $(PATH_BIN)/AutoStartMenu.exe         $(VBOX_PATH_PACK_BUNDLE_TMP)/
     597        $(CP) $(PATH_STAGE_BIN)/$(PACKAGE_NAME_MULTIARCH_FINAL)       $(VBOX_PATH_PACK_BUNDLE_TMP)/$(PACKAGE_NAME_MULTIARCH_FINAL)
     598 endif
     599        $(CP) $(PATH_STAGE_BIN)/VBoxBundleMachine.exe     $(VBOX_PATH_PACK_BUNDLE_TMP)/
     600        $(CP) $(PATH_STAGE_BIN)/AutoStartMenu.exe         $(VBOX_PATH_PACK_BUNDLE_TMP)/
    601601 ifdef VBOX_BRAND_WIN_AS_MENU
    602602        $(MKDIR) -p $(VBOX_PATH_PACK_BUNDLE_TMP)/Menu/Graphics/

  • trunk/src/VBox/Main/Makefile.kmk

    r38037 r38082  
    3737 # I'm Evil! Dr. Evil.
    3838 VBoxCOM_0_OUTDIR = $(PATH_TARGET)/VBoxCOM
    39  BLDDIRS += $(VBoxCOM_0_OUTDIR) $(PATH_BIN)/components
     39 BLDDIRS += $(VBoxCOM_0_OUTDIR) $(PATH_STAGE_BIN)/components
    4040 include $(KBUILD_PATH)/tools/VCC70.kmk
    4141 include $(KBUILD_PATH)/sdks/WINPSDK.kmk
    … …  
    7171VBOX_IDL_FILE.XPCOM    = $(VBOX_PATH_SDK)/bindings/xpcom/idl/VirtualBox_XPCOM.idl
    7272
    73 VBOX_IDL_TYPELIB.XPCOM = $(PATH_BIN)/components/VirtualBox_XPCOM.xpt
     73VBOX_IDL_TYPELIB.XPCOM = $(PATH_STAGE_BIN)/components/VirtualBox_XPCOM.xpt
    7474VBOX_IDL_HEADER.XPCOM  = $(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
    7575
    … …  
    258258
    259259VBoxSVC_LIBS += \
    260         $(PATH_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \
     260        $(PATH_STAGE_LIB)/SSMStandalone$(VBOX_SUFF_LIB) \
    261261        $(LIB_DDU)
    262262VBoxSVC_SDKS = VBOX_LIBPNG VBOX_ZLIB
    … …  
    504504  VBoxTestOGL_LIBS = \
    505505        $(if $(VBOX_WITH_CROGL), \
    506           $(PATH_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
     506          $(PATH_STAGE_LIB)/VBoxOGLhostspuload$(VBOX_SUFF_LIB) \
    507507          $(VBOX_LIB_OGL_HOSTCRUTIL),) \
    508         $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
     508        $(if $(VBOX_WITH_VIDEOHWACCEL), $(PATH_STAGE_LIB)/VBoxOGL2D$(VBOX_SUFF_LIB),) \
    509509        $(LIB_RUNTIME)
    510510  VBoxTestOGL_DEFS += \

  • trunk/src/VBox/Main/webservice/Makefile.kmk

    r37999 r38082  
    280280 endif
    281281 vboxwebsrv_LIBS += \
    282         $(PATH_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
     282        $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
    283283        $(VBOX_GSOAP_CXX_LIBS)
    284284 vboxwebsrv_LIBS.solaris += socket nsl
    … …  
    377377        .
    378378 webtest_LIBS += \
    379         $(PATH_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
     379        $(PATH_STAGE_LIB)/vboxsoap$(VBOX_SUFF_LIB) \
    380380        $(VBOX_GSOAP_CXX_LIBS)
    381381 webtest_LIBS.solaris += nsl

  • trunk/src/VBox/RDP/client/Makefile.kmk

    r37224 r38082  
    130130# The source tarball (further down).
    131131#
    132 ## @todo change this to an INSTALLS target.
    133 OTHERS += $(PATH_BIN)/rdesktop-vrdp.tar.gz
    134 OTHER_CLEAN += $(OTHERS)
    135 
    136132INSTALLS += rdesktop-bin
    137 rdesktop-bin_INST    = obj/rdesktop-src/$(VBOX_RDESKTOP_SRC_SUBDIR)/
    138 rdesktop-bin_MODE    = a+rx,u+w
    139 rdesktop-bin_SOURCES = \
     133rdesktop-bin_INSTTYPE = stage
     134rdesktop-bin_INST     = misc-staging/$(VBOX_RDESKTOP_SRC_SUBDIR)/
     135rdesktop-bin_MODE     = a+rx,u+w
     136rdesktop-bin_SOURCES  = \
    140137        configure \
    141138        config.sub \
    142139        config.guess \
    143140        bootstrap \
    144         install-sh
     141        install-sh \
     142        keymaps/convert-map=>keymaps/convert-map
    145143
    146144INSTALLS += rdesktop-nonbin
    147 rdesktop-nonbin_INST    = obj/rdesktop-src/$(VBOX_RDESKTOP_SRC_SUBDIR)/
    148 rdesktop-nonbin_MODE    = a+r,u+w
     145rdesktop-nonbin_INSTTYPE = stage
     146rdesktop-nonbin_INST     = $(rdesktop-bin_INST)
     147rdesktop-nonbin_MODE     = a+r,u+w
     148## @todo move the content of files_rdesktop-vrdp here. There is no call for a separate file in this case.
    149149include $(PATH_SUB_CURRENT)/files_rdesktop-vrdp
    150150
    151 $(PATH_BIN)/rdesktop-vrdp.tar.gz: \
     151INSTALLS += rdesktop-tarball
     152rdesktop-tarball_INST    = $(INST_BIN)
     153rdesktop-tarball_MODE    = a+r,u+w
     154rdesktop-tarball_SOURCES = $(rdesktop-tarball_0_OUTDIR)/rdesktop-vrdp.tar.gz
     155rdesktop-tarball_CLEAN   = $(rdesktop-tarball_0_OUTDIR)/rdesktop-vrdp.tar.gz
     156$$(rdesktop-tarball_0_OUTDIR)/rdesktop-vrdp.tar.gz: \
    152157                $$(rdesktop-bin_1_TARGET) \
    153                 $$(rdesktop-nonbin_1_TARGET)
     158                $$(rdesktop-nonbin_1_TARGET) \
     159                | $$(dir $$@)
    154160        $(call MSG_TOOL,tar/gzip,,$@)
    155         $(QUIET)cd $(PATH_INS)/obj/rdesktop-src/ && tar -cf - $(VBOX_RDESKTOP_SRC_SUBDIR)/ | gzip - > $@
     161        $(QUIET)cd $(PATH_STAGE)/$(rdesktop-bin_INST).. && tar -cf - $(VBOX_RDESKTOP_SRC_SUBDIR)/ | gzip - > $@
    156162
    157163

  • trunk/src/VBox/RDP/client/files_rdesktop-vrdp

    r37955 r38082  
    122122        $(PATH_ROOT)/src/VBox/RDP/client/keymaps/en-us=>keymaps/en-us \
    123123        $(PATH_ROOT)/src/VBox/RDP/client/keymaps/et=>keymaps/et \
    124         $(PATH_ROOT)/src/VBox/RDP/client/keymaps/convert-map=>keymaps/convert-map \
    125124        $(PATH_ROOT)/src/VBox/RDP/client/keymaps/en-dv=>keymaps/en-dv \
    126125        $(PATH_ROOT)/src/VBox/RDP/client/keymaps/mk=>keymaps/mk \

  • trunk/src/VBox/Runtime/Makefile.kmk

    r38037 r38082  
    12621262VBoxRT_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH) = $(RuntimeR3_INCS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    12631263VBoxRT_LIBS                    = \
    1264         $(PATH_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
     1264        $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
    12651265        $(SDK_VBOX_ZLIB_LIBS)
    12661266if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
    12671267VBoxRT_LIBS                   += \
    1268         $(PATH_LIB)/SUPR3$(VBOX_SUFF_LIB)
     1268        $(PATH_STAGE_LIB)/SUPR3$(VBOX_SUFF_LIB)
    12691269endif
    12701270ifdef IPRT_WITH_KSTUFF
    12711271 VBoxRT_LIBS                  += \
    1272         $(PATH_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
     1272        $(PATH_STAGE_LIB)/VBox-kStuff$(VBOX_SUFF_LIB)
    12731273endif
    12741274ifndef SDK_VBOX_LIBXML2_LIBS
    12751275 VBoxRT_LIBS                 += \
    1276         $(PATH_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
     1276        $(PATH_STAGE_LIB)/VBox-libxml2$(VBOX_SUFF_LIB)
    12771277endif
    12781278ifndef SDK_VBOX_OPENSSL_LIBS
    12791279 VBoxRT_LIBS                 += \
    1280         $(PATH_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
    1281         $(PATH_LIB)/VBox-libssl$(VBOX_SUFF_LIB)
     1280        $(PATH_STAGE_LIB)/VBox-libcrypto$(VBOX_SUFF_LIB) \
     1281        $(PATH_STAGE_LIB)/VBox-libssl$(VBOX_SUFF_LIB)
    12821282endif
    12831283ifdef IPRT_WITH_LZO
    … …  
    13071307VBoxRT_LDFLAGS.l4              = \
    13081308        -Wl,-whole-archive \
    1309         $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \
     1309        $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB) \
    13101310        -Wl,-no-whole-archive
    13111311ifeq ($(KBUILD_TARGET),l4)
    … …  
    13151315endif
    13161316VBoxRT_LIBS.l4                 = \
    1317         $(PATH_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
     1317        $(PATH_STAGE_LIB)/RuntimeR3L4$(VBOX_SUFF_LIB)
    13181318
    13191319if1of ($(DLLS), VBoxRT)
    … …  
    13391339VBoxRTDummy_TEMPLATE = VBOXR3
    13401340VBoxRTDummy_NOINST = true
    1341 VBoxRTDummy_LIBS = $(PATH_BIN)/VBoxRT.so
    1342 VBoxRTDummy_CLEAN= $(PATH_BIN)/VBoxRT.so
    1343 BLDDIRS += $(PATH_BIN)
    1344 
    1345 $(PATH_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@)
     1341VBoxRTDummy_LIBS = $(PATH_STAGE_BIN)/VBoxRT.so
     1342VBoxRTDummy_CLEAN= $(PATH_STAGE_BIN)/VBoxRT.so
     1343BLDDIRS += $(PATH_STAGE_BIN)
     1344
     1345$(PATH_STAGE_BIN)/VBoxRT.so: $$(VBoxRT_1_TARGET) | $$(dir $$@)
    13461346        $(INSTALL) $< $@
    13471347        chcon -t texrel_shlib_t $@ || true

  • trunk/src/VBox/Runtime/testcase/Makefile.kmk

    r37720 r38082  
    279279tstLdr-2_DEFS = IN_DIS
    280280tstLdr-2_LIBS = \
    281         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
     281        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    282282
    283283ifdef VBOX_WITH_RAW_MODE
    … …  
    291291 endif
    292292 tstLdrObj_LIBS = \
    293         $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
    294         $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
     293        $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
     294        $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
    295295 ifeq ($(VBOX_LDR_FMT32),pe)
    296296 tstLdrObj_LIBS += \
    297         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
     297        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
    298298 endif # PE
    299299 ifeq ($(VBOX_LDR_FMT32),elf)
    … …  
    302302 ifeq ($(VBOX_LDR_FMT32),lx)
    303303 tstLdrObj_LIBS += \
    304         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
     304        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
    305305 endif
    306306endif # VBOX_WITH_RAW_MODE
    … …  
    309309tstLdr-3_DEFS = IN_DIS
    310310tstLdr-3_LIBS = \
    311         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
     311        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    312312
    313313tstLdr-4Imp_TEMPLATE = VBoxR0
    … …  
    330330endif
    331331tstLdrObjR0_LIBS = \
    332         $(PATH_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
    333         $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     332        $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB) \
     333        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    334334ifeq ($(VBOX_LDR_FMT),pe)
    335335 tstLdrObjR0_LIBS += \
    336         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \
     336        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \
    337337        $(TARGET_tstLdr-4Imp)
    338338endif
    … …  
    342342ifeq ($(VBOX_LDR_FMT),lx)
    343343 tstLdrObjR0_LIBS += \
    344         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB) \
     344        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB) \
    345345        $(TARGET_tstLdr-4Imp)
    346346endif
    … …  
    349349tstLdr-4_DEFS = IN_DIS
    350350tstLdr-4_LIBS = \
    351         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
     351        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    352352
    353353tstLdrLoad_SOURCES = tstLdrLoad.cpp
    … …  
    528528tstRTR0MemUserKernel_SYSSUFF = .r0
    529529tstRTR0MemUserKernel_SOURCES = tstRTR0MemUserKernel.cpp
    530 tstRTR0MemUserKernel_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     530tstRTR0MemUserKernel_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    531531if1of ($(VBOX_LDR_FMT), pe lx)
    532  tstRTR0MemUserKernel_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     532 tstRTR0MemUserKernel_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    533533endif
    534534tstRTR0MemUserKernelDriver_TEMPLATE = VBOXR3TSTEXE
    … …  
    541541tstRTR0SemMutex_SYSSUFF = .r0
    542542tstRTR0SemMutex_SOURCES = tstRTR0SemMutex.cpp
    543 tstRTR0SemMutex_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     543tstRTR0SemMutex_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    544544if1of ($(VBOX_LDR_FMT), pe lx)
    545  tstRTR0SemMutex_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     545 tstRTR0SemMutex_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    546546endif
    547547tstRTR0SemMutexDriver_TEMPLATE = VBOXR3TSTEXE
    … …  
    554554tstRTR0Timer_SYSSUFF = .r0
    555555tstRTR0Timer_SOURCES = tstRTR0Timer.cpp
    556 tstRTR0Timer_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     556tstRTR0Timer_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    557557if1of ($(VBOX_LDR_FMT), pe lx)
    558  tstRTR0Timer_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     558 tstRTR0Timer_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    559559endif
    560560tstRTR0TimerDriver_TEMPLATE = VBOXR3TSTEXE
    … …  
    567567tstR0ThreadPreemption_SYSSUFF = .r0
    568568tstR0ThreadPreemption_SOURCES = tstR0ThreadPreemption.cpp
    569 tstR0ThreadPreemption_LIBS = $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
     569tstR0ThreadPreemption_LIBS = $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB)
    570570if1of ($(VBOX_LDR_FMT), pe lx)
    571  tstR0ThreadPreemption_LIBS += $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     571 tstR0ThreadPreemption_LIBS += $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    572572endif
    573573tstR0ThreadPreemptionDriver_TEMPLATE = VBOXR3TSTEXE

  • trunk/src/VBox/Storage/testcase/Makefile.kmk

    r37235 r38082  
    8686 if1of ($(KBUILD_TARGET),os2 win)
    8787  vbox-img_LIBS += \
    88         $(PATH_LIB)/VBox-liblzf-static$(VBOX_SUFF_LIB) \
    89         $(PATH_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
     88        $(PATH_STAGE_LIB)/VBox-liblzf-static$(VBOX_SUFF_LIB) \
     89        $(PATH_STAGE_LIB)/VBox-zlib-static$(VBOX_SUFF_LIB)
    9090 else
    9191  vbox-img_LIBS += \
    92         $(PATH_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
     92        $(PATH_STAGE_LIB)/VBox-liblzf$(VBOX_SUFF_LIB) \
    9393        $(SDK_VBOX_ZLIB_LIBS)
    9494 endif

  • trunk/src/VBox/VMM/Makefile.kmk

    r37581 r38082  
    236236
    237237VBoxVMM_LIBS = \
    238         $(PATH_LIB)/VMMR3$(VBOX_SUFF_LIB) \
    239         $(PATH_LIB)/DisasmR3$(VBOX_SUFF_LIB)
     238        $(PATH_STAGE_LIB)/VMMR3$(VBOX_SUFF_LIB) \
     239        $(PATH_STAGE_LIB)/DisasmR3$(VBOX_SUFF_LIB)
    240240ifdef VBOX_WITH_DEBUGGER
    241241 VBoxVMM_LIBS += \
    242         $(PATH_LIB)/Debugger$(VBOX_SUFF_LIB)
     242        $(PATH_STAGE_LIB)/Debugger$(VBOX_SUFF_LIB)
    243243endif
    244244VBoxVMM_LIBS += \
    … …  
    361361
    362362 VMMRC_LIBS      = \
    363         $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
    364         $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
     363        $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
     364        $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
    365365 ifneq ($(filter pe lx,$(VBOX_LDR_FMT32)),)
    366366  VMMRC_LIBS    += \
    367         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
     367        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB)
    368368 endif
    369369
    … …  
    529529
    530530 VMMR0_LIBS = \
    531         $(PATH_LIB)/ServicesR0$(VBOX_SUFF_LIB) \
    532         $(PATH_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
    533         $(PATH_LIB)/DisasmR0$(VBOX_SUFF_LIB)
     531        $(PATH_STAGE_LIB)/ServicesR0$(VBOX_SUFF_LIB) \
     532        $(PATH_STAGE_LIB)/RuntimeR0$(VBOX_SUFF_LIB) \
     533        $(PATH_STAGE_LIB)/DisasmR0$(VBOX_SUFF_LIB)
    534534 ifneq ($(filter pe lx,$(VBOX_LDR_FMT)),)
    535535  VMMR0_LIBS += \
    536         $(PATH_LIB)/SUPR0$(VBOX_SUFF_LIB)
     536        $(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
    537537 endif
    538538endif # !VBOX_ONLY_EXTPACKS

  • trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

    r37354 r38082  
    24582458                        if (PGM_PAGE_HAS_ACTIVE_HANDLERS(pPage))
    24592459                        {
     2460#if 0 /* DONT COMMIT THIS!!!!!!!! It needs fixing! */
    24602461                            AssertMsgFailed(("%R[pgmpage] - we don't set PGM_PTFLAGS_TRACK_DIRTY for these pages\n", pPage));
    24612462                            Assert(!PGM_PAGE_HAS_ACTIVE_ALL_HANDLERS(pPage));
     2463#endif
    24622464                            /* Assuming write handlers here as the PTE is present (otherwise we wouldn't be here). */
    24632465                            SHW_PTE_SET_RO(PteDst);

  • trunk/src/VBox/VMM/testcase/Makefile.kmk

    r37955 r38082  
    272272 tstMicroRC_SYSSUFF      = .gc
    273273 tstMicroRC_LIBS         = \
    274         $(PATH_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
    275         $(PATH_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
     274        $(PATH_STAGE_LIB)/DisasmRC$(VBOX_SUFF_LIB) \
     275        $(PATH_STAGE_LIB)/RuntimeRC$(VBOX_SUFF_LIB)
    276276 ifeq ($(filter-out pe lx,$(VBOX_LDR_FMT32)),)
    277277  tstMicroRC_LIBS        += \
    278         $(PATH_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
     278        $(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
    279279        $(LIB_VMMGC)
    280280 endif

  • trunk/src/libs/xpcom18a4/Makefile.kmk

    r37998 r38082  
    13121312$(PATH_TARGET)/VBox-xpcom-xpt-files/VBoxXPCOMBase.xpt: $$(VBOX_XPTFILES) | $$(xpt_link_1_TARGET) $(PATH_TARGET)/VBox-xpcom-xpt-files/
    13131313        $(call MSG_LINK,XPCOM_TYPELIB,$@)
    1314         $(QUIET)$(MKDIR) -p -- $(PATH_BIN)/components
     1314        $(QUIET)$(MKDIR) -p -- $(PATH_STAGE_BIN)/components
    13151315        $(QUIET)$(xpt_link_1_TARGET) $@ $^
    13161316
    … …  
    13561356# INSTARGET_xpidl which is the one in bin/.
    13571357#
    1358 $(VBOX_XPIDL): $(PATH_TARGET)/VBox-xpcom-idl-timestamp
     1358$(VBOX_XPIDL): | $(PATH_TARGET)/VBox-xpcom-idl-timestamp
    13591359
    13601360

  • trunk/src/libs/xpcom18a4/java/Makefile.kmk

    r32229 r38082  
    5858        src/nsJavaInterfaces.cpp
    5959VBoxJXpcom_LIBS     = \
    60         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
    61         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
     60        $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
     61        $(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
    6262
    6363#VBoxJXpcom_ORDERDEPS = $(VBOX_JXPCOM_GENH)

  • trunk/src/libs/xpcom18a4/python/Makefile.kmk

    r37113 r38082  
    7373        src/VariantUtils.cpp
    7474VBoxPythonBase_LIBS     = \
    75         $(PATH_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
    76         $(PATH_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
     75        $(PATH_STAGE_LIB)/VBoxCOM$(VBOX_SUFF_LIB) \
     76        $(PATH_STAGE_BIN)/VBoxXPCOM$(VBOX_SUFF_DLL)
    7777
    7878

  • trunk/src/recompiler/Makefile.kmk

    r37692 r38082  
    129129 VBoxRemPrimary_SYSSUFF    = .rel
    130130 VBoxRemPrimary_LIBS       = \
    131         $(PATH_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB)
     131        $(PATH_STAGE_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB)
    132132 VBoxRemPrimary_POST_CMDS  = $(NO_SUCH_VARIABLE)
    133133 VBOX_REM_WRAPPER          = 2
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette