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

Timestamp:

Jul 25, 2011 12:30:55 PM (14 years ago)

Author:

vboxsync

Message:

*.kmk: PATH_INS -> PATH_STAGE.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Installer/Loader/Makefile.kmk (modified) (1 diff)
• common/VBoxGuest/Makefile.kmk (modified) (2 diffs)
• freebsd/drm/Makefile.kmk (modified) (2 diffs)

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

@@ -34 +34 @@
 
  VBoxWindowsAdditions_LIBS     = \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(BUILD_TARGET_ARCH))_LIB)/oldnames.lib \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(BUILD_TARGET_ARCH))_LIB)/libcmt.lib \
-        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(BUILD_TARGET_ARCH))_LIB)/libcpmt.lib
+        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/oldnames.lib \
+        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcmt.lib \
+        $(PATH_TOOL_$(TEMPLATE_VBOXR3EXE_TOOL.win.$(KBUILD_TARGET_ARCH))_LIB)/libcpmt.lib
 
  # Version stuff.

trunk/src/VBox/Additions/common/VBoxGuest/Makefile.kmk

@@ -50 +50 @@
  VBoxGuest_DEFS          = VBGL_VBOXGUEST VBOX_WITH_HGCM
  VBoxGuest_INCS          = .
- VBoxGuest_INCS.freebsd  = $(PATH_VBoxGuest) $(PATH_INS)/gen-sys-hdrs
+ VBoxGuest_INCS.freebsd  = $(PATH_VBoxGuest) $(PATH_STAGE)/gen-sys-hdrs
  VBoxGuest_INCS.linux    = ../../../Runtime/r0drv/linux
  VBoxGuest_LDFLAGS.solaris += -N misc/ctf
@@ -85 +85 @@
         $(VBOX_LIB_IPRT_GUEST_R0)
   VBoxGuest_ORDERDEPS.freebsd = \
-        $(PATH_INS)/gen-sys-hdrs/pci_if.h \
-        $(PATH_INS)/gen-sys-hdrs/bus_if.h \
-        $(PATH_INS)/gen-sys-hdrs/device_if.h
+        $(PATH_STAGE)/gen-sys-hdrs/pci_if.h \
+        $(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
+        $(PATH_STAGE)/gen-sys-hdrs/device_if.h
  else # OS/2:
   # The library order is crucial, so a bit of trickery is necessary.

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

@@ -48 +48 @@
 vboxvideo_drm_INCS.freebsd  = \
         $(vboxvideo_drm_0_OUTDIR) \
-        $(PATH_INS)/gen-sys-hdrs
+        $(PATH_STAGE)/gen-sys-hdrs
 vboxvideo_drm_SOURCES       = vboxvideo_drm.c
 vboxvideo_drm_LIBS          = \
@@ -54 +54 @@
         $(VBOX_LIB_IPRT_GUEST_R0)
 vboxvideo_drm_ORDERDEPS.freebsd = \
-        $(PATH_INS)/gen-sys-hdrs/pci_if.h \
-        $(PATH_INS)/gen-sys-hdrs/bus_if.h \
-        $(PATH_INS)/gen-sys-hdrs/device_if.h \
+        $(PATH_STAGE)/gen-sys-hdrs/pci_if.h \
+        $(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
+        $(PATH_STAGE)/gen-sys-hdrs/device_if.h \
         $(vboxvideo_drm_0_OUTDIR)/opt_drm.h
 vboxvideo_drm_CLEAN.freebsd = $(vboxvideo_drm_DEPS)