Changeset 34632 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 2, 2010 5:17:39 PM (14 years ago)

Author:

vboxsync

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

68434

Message:

Installer/Solaris: do not show license on package install, eliminate redundant OSE checks

File:

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

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

@@ -270 +270 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg.conf \
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg_modeless.conf \
-                $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
+                $(VBOX_BRAND_LICENSE_TXT) \
                 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf \
                 $(PATH_SUB_CURRENT)/solaris/Makefile.kmk \
@@ -289 +289 @@
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxguest.space                    $(SOLARIS_ADDINST_OUT_DIR)/vboxguest.space
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxguest.depend                   $(SOLARIS_ADDINST_OUT_DIR)/vboxguest.depend
-        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_TXT)                                $(SOLARIS_ADDINST_OUT_DIR)/vboxguest.copyright)
+        # don't display the license on package install, since 4.0
+        #$(QUIET)$(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_TXT)                                                  $(SOLARIS_ADDINST_OUT_DIR)/vboxguest.copyright
         $(call MSG_L1,Creating install package: $@)
         $(QUIET)$(MKDIR) -p $(SOLARIS_ADD_ETCFS_DIR)
@@ -514 +515 @@
                 $(VBOX_PATH_X11_ADDITION_INSTALLER)/solaris_xorg_modeless.conf \
                 $(VBOX_SOLPACKFILES) \
-                $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
+                $(VBOX_BRAND_LICENSE_TXT) \
                 $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf \
                 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/VBox.sh \
@@ -540 +541 @@
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxguest.space                  $(SOLARIS_ADD_INST_DIR)/vboxguest.space
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_SOLARIS_ADDITION_INSTALLER)/vboxguest.depend                 $(SOLARIS_ADD_INST_DIR)/vboxguest.depend
-        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_TXT)                              $(SOLARIS_ADD_INST_DIR)/vboxguest.copyright)
+        # don't display the license on package install, since 4.0
+        #$(QUIET)$(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_TXT)                                                $(SOLARIS_ADD_INST_DIR)/vboxguest.copyright
         $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxclient.desktop                   $(SOLARIS_ADD_INST_DIR)/vboxclient.desktop
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/98vboxadd-xclient                    $(SOLARIS_ADD_INST_DIR)/1099.vboxclient