Changeset 13689 in vbox for trunk/src/VBox/Additions/solaris/Makefile.kmk

Timestamp:

Oct 30, 2008 7:55:42 PM (16 years ago)

Author:

vboxsync

Message:

Installer/solaris: COMPRESS -> VBOX_COMPRESS. One-word variables are off limits.

File:

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

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

@@ -44 +44 @@
  BIN_COPY         := /usr/sfw/bin/gobjcopy -S -R .comment
  BIN_COPY_SYMBOLS := /usr/sfw/bin/gobjcopy -g -R .comment
- COMPRESS         := compress -f
+ VBOX_COMPRESS    := compress -f
 endif
 
@@ -173 +173 @@
         $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_70.so                                       $(SOLARIS_INST_DIR_32)/vboxmouse_drv_70.so
         $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_71.so                                       $(SOLARIS_INST_DIR_32)/vboxmouse_drv_71.so
-ifdef COMPRESS
-        @# Compress binaries as we distribute uncompressed pkgs
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/VBoxClient
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/VBoxService
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/VBoxControl
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/vboxvideo_drv_13.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/vboxvideo_drv_14.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/vboxvideo_drv_70.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/vboxvideo_drv_71.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/vboxmouse_drv_14.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/vboxmouse_drv_70.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_64)/vboxmouse_drv_71.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/VBoxClient
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/VBoxService
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/VBoxControl
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/vboxvideo_drv_13.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/vboxvideo_drv_14.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/vboxvideo_drv_70.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/vboxvideo_drv_71.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/vboxmouse_drv_14.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/vboxmouse_drv_70.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_32)/vboxmouse_drv_71.so
-endif
-else
+ ifdef VBOX_COMPRESS
+ #      Compress binaries as we distribute uncompressed pkgs
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/VBoxClient
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/VBoxService
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/VBoxControl
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/vboxvideo_drv_13.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/vboxvideo_drv_14.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/vboxvideo_drv_70.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/vboxvideo_drv_71.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/vboxmouse_drv_14.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/vboxmouse_drv_70.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_64)/vboxmouse_drv_71.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/VBoxClient
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/VBoxService
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/VBoxControl
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/vboxvideo_drv_13.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/vboxvideo_drv_14.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/vboxvideo_drv_70.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/vboxvideo_drv_71.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/vboxmouse_drv_14.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/vboxmouse_drv_70.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_32)/vboxmouse_drv_71.so
+ endif # VBOX_COMPRESS
+else  # !VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
         $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN)/vboxguest                                             $(SOLARIS_INST_DIR_ISA)/vboxguest
         $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxClient                                         $(SOLARIS_INST_DIR_ISA)/VBoxClient
@@ -208 +208 @@
         $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_70.so                                          $(SOLARIS_INST_DIR_ISA)/vboxmouse_drv_70.so
         $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_71.so                                          $(SOLARIS_INST_DIR_ISA)/vboxmouse_drv_71.so
-ifdef COMPRESS
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/VBoxClient
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/VBoxService
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/VBoxControl
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxvideo_drv_13.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxvideo_drv_14.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxvideo_drv_70.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxvideo_drv_71.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxmouse_drv_14.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxmouse_drv_70.so
-        $(QUIET)$(COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxmouse_drv_71.so
-endif
-endif
+ ifdef VBOX_COMPRESS
+ #      Compress binaries as we distribute uncompressed pkgs
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/VBoxClient
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/VBoxService
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/VBoxControl
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxvideo_drv_13.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxvideo_drv_14.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxvideo_drv_70.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxvideo_drv_71.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxmouse_drv_14.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxmouse_drv_70.so
+        $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_INST_DIR_ISA)/vboxmouse_drv_71.so
+ endif # VBOX_COMPRESS
+endif # !VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh                          $(SOLARIS_INST_DIR)/VBox.sh
         $(call MSG_L1,Creating install package: $@)