Changeset 20505 in vbox for trunk/src/VBox/Installer

Timestamp:

Jun 12, 2009 11:44:04 AM (15 years ago)

Author:

vboxsync

Message:

solaris/Makefile.kmk: Put things in the right place. Don't use foreach if addprefix will do.

File:

• trunk/src/VBox/Installer/solaris/Makefile.kmk (modified) (5 diffs)

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

@@ -102 +102 @@
 #
 PROGRAMS         += VBoxZoneAccess VBoxISAExec
-INSTALLS         += solaris-doc
-
-INSTALLS += solaris-bin
-solaris-bin_INST = bin/
-solaris-bin_MODE = a+rx,u+w
-solaris-bin_SOURCES = \
-        $(if $(VBOX_WITH_PYTHON),$(PATH_ROOT)/src/VBox/Frontends/VBoxShell/vboxshell.py=>vboxshell.py,)
+INSTALLS         += solaris-doc solaris-bin
 
 BLDDIRS          += \
@@ -117 +111 @@
         $(SOLARIS_DBG_DIR)
 
-BLDDIRS += $(foreach d,\
+BLDDIRS          += $(addprefix $(SOLARIS_BASEINST_DIR)/,\
         usr \
         usr/bin \
@@ -125 +119 @@
         platform/i86pc/kernel/drv \
         platform/i86pc/kernel/drv/amd64 \
-,$(SOLARIS_BASEINST_DIR)/$(d))
-
+)
 
 PACKING          += $(PATH_BIN)/$(PKG_FILENAME).tar.gz $(PATH_BIN)/$(DBG_ARCHIVE)
@@ -132 +125 @@
 OTHER_CLEAN      += $(addprefix $(SOLARIS_BASEINST_DIR)/,\
         vbox.pkginfo vbox.copyright vbox.space vbox.pkgresponse \
-        makepackage.sh prototype postinstall.sh preremove.sh)
+        makepackage.sh prototype postinstall.sh preremove.sh)
 
 #
@@ -158 +151 @@
         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_64px.png=>VBox.png
 
+solaris-bin_INST = bin/
+solaris-bin_MODE = a+rx,u+w
+solaris-bin_SOURCES = \
+        $(if $(VBOX_WITH_PYTHON),$(PATH_ROOT)/src/VBox/Frontends/VBoxShell/vboxshell.py=>vboxshell.py,)
+
 #
 # Note: Other than the files produced during packing (.pkg, .gzip etc.) all files that
 # go into the temporary install folder $(SOLARIS_VBOXINST_DIR) should be part of $(SOLARIS_ARCH_FILES).
 # For the files produced during packing they should be cleaned up promptly when the work is done.
+#
 
 # Strip these executables