Changeset 12218 in vbox

Timestamp:

Sep 8, 2008 12:13:40 PM (16 years ago)

Author:

vboxsync

Message:

Additions: backed out missing bits till it's redone.

File:

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

trunk/src/VBox/Additions/Makefile.kmk

@@ -141 +141 @@
  VBOX_PATH_ADDITIONS.solaris = $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions
  GUESTADDITIONS_FILESPEC.solaris = \
-        VBoxSolarisAdditions.pkg=$(VBOX_PATH_ADDITIONS.solaris)/VBoxSolarisAdditions.pkg
+        VBoxSolarisAdditions-amd64.pkg=$(VBOX_PATH_ADDITIONS.solaris)/VBoxSolarisAdditions.pkg
+endif
+ifdef VBOX_WITH_ADDITIONS_ISO.solaris.x86
+ VBOX_PATH_ADDITIONS.solaris = $(PATH_OUT_BASE)/solaris.x86/$(KBUILD_TYPE)/bin/additions
+ GUESTADDITIONS_FILESPEC.solaris = \
+        VBoxSolarisAdditions-x86.pkg=$(VBOX_PATH_ADDITIONS.solaris)/VBoxSolarisAdditions.pkg
 endif
 
@@ -217 +222 @@
                                 $(GUESTADDITIONS_FILESPEC.win.x86) \
                                 $(GUESTADDITIONS_FILESPEC.win.amd64) \
-                                $(GUESTADDITIONS_FILESPEC.solaris) \
+                                $(GUESTADDITIONS_FILESPEC.solaris.x86) \
+                                $(GUESTADDITIONS_FILESPEC.solaris.amd64) \
                                 $(GUESTADDITIONS_FILESPEC.os2.x86) \
                                 $(GUESTADDITIONS_FILESPEC.linux.x86) \
@@ -236 +242 @@
                 $(GUESTADDITIONS_FILESPEC.win.x86) \
                 $(GUESTADDITIONS_FILESPEC.win.amd64) \
-                $(GUESTADDITIONS_FILESPEC.solaris) \
+                $(GUESTADDITIONS_FILESPEC.solaris.x86) \
+                $(GUESTADDITIONS_FILESPEC.solaris.amd64) \
                 $(GUESTADDITIONS_FILESPEC.os2.x86) \
                 $(GUESTADDITIONS_FILESPEC.linux.x86) \