Changeset 7025 in vbox for trunk/src/VBox

Timestamp:

Feb 20, 2008 9:59:02 AM (17 years ago)

Author:

vboxsync

Message:

Corrected VBOX_PATH_ADDITIONS.linux.x86 to do like the windows and os2 setups.

File:

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

trunk/src/VBox/Additions/Makefile.kmk

@@ -80 +80 @@
   VBOX_PATH_ADDITIONS.win.x86 = $(PATH_OUT_BASE)/win.x86/$(BUILD_TYPE)/bin/additions
  else
-  VBOX_PATH_ADDITIONS.win.x86 = $(VBOX_PATH_ADDITIONS)
+  VBOX_PATH_ADDITIONS.win.x86 = $(VBOX_PATH_ADDITIONS) # 32-only hack
  endif
  ## @todo We're missing the .cat files and using the wrong .inf files here.
@@ -138 +138 @@
 #
 ifdef VBOX_WITH_ADDITIONS_ISO.linux.x86
- VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(BUILD_TYPE)/bin/additions
+ ifdef VBOX_ONLY_ADDITIONS
+  VBOX_PATH_ADDITIONS.linux.x86 = $(PATH_OUT_BASE)/linux.x86/$(BUILD_TYPE)/bin/additions
+ else
+  VBOX_PATH_ADDITIONS.linux.x86 = $(VBOX_PATH_ADDITIONS) # 32-bit only hack
+ endif
  GUESTADDITIONS_FILESPEC.linux.x86 = \
         VBoxLinuxAdditions.run=$(VBOX_PATH_ADDITIONS.linux.x86)/VBoxLinuxAdditions.run