Changeset 25725 in vbox

Timestamp:

Jan 11, 2010 2:49:15 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

56468

Message:

Solaris/Additions: fix duplicate target.

File:

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

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

@@ -88 +88 @@
 
 INSTALLS          += solaris-addcommon solaris-addcommonbins
-PROGRAMS          += VBoxISAExec
+PROGRAMS          += VBoxAddISAExec
 PACKING           += $(PATH_BIN)/additions/$(PKGFILENAME)
 OTHER_CLEAN       += $(PACKING)
 
 #
-# VBoxISAExec
-#
-VBoxISAExec_TEMPLATE = VBOXR3EXE
-VBoxISAExec_INST     = $(INST_ADDITIONS)
-VBoxISAExec_DEPS     = $(VBOX_SVN_REV_KMK)
-VBoxISAExec_SOURCES  = $(PATH_ROOT)/src/VBox/Installer/solaris/VBoxISAExec.c
+# VBoxAddISAExec
+#
+VBoxAddISAExec_TEMPLATE = VBOXR3EXE
+VBoxAddISAExec_NAME     = VBoxISAExec
+VBoxAddISAExec_INST     = $(INST_ADDITIONS)
+VBoxAddISAExec_DEPS     = $(VBOX_SVN_REV_KMK)
+VBoxAddISAExec_SOURCES  = $(PATH_ROOT)/src/VBox/Installer/solaris/VBoxISAExec.c
 
 #
@@ -219 +220 @@
         $(addprefix $(SOLARIS_ADD_DRIVERINST_DIR_32)/,$(SOLARIS_ADD_DRIVERS)) \
         $(addprefix $(SOLARIS_ADD_DRIVERINST_DIR)/,$(SOLARIS_ADD_DRIVERS_CONF)) \
-        $(addprefix $(SOLARIS_VBOXADDINST_DIR)/,$(SOLARIS_ADD_XORG_DRIVERS))
+        $(addprefix $(SOLARIS_VBOXADDINST_DIR_32)/,$(SOLARIS_ADD_XORG_DRIVERS))
 else
   SOLARIS_ARCH_ADD_DEPFILES = \