Changeset 34632 in vbox for trunk/src/VBox/Installer/solaris

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/Installer/solaris/Makefile.kmk (modified) (7 diffs)

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

@@ -144 +144 @@
 solaris-doc_MODE    = a+r,u+w
 solaris-doc_SOURCES = \
-        $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)=>LICENSE) \
+        $(VBOX_BRAND_LICENSE_TXT)=>LICENSE \
         $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/images/$(if $(VBOX_OSE),OSE,NonOSE)/VirtualBox_64px.png=>VBox.png
 
@@ -276 +276 @@
 # Things packed explicitly, not from $(PATH_BIN), track these to clean-up properly
 SOLARIS_EXTRAS = \
-        $(if $(VBOX_OSE),,LICENSE) \
+        LICENSE \
         VBox.png \
         autoresponse \
@@ -486 +486 @@
         $(PKG_FILENAME).pkg \
         $(if $(VBOX_WITH_SOLARIS_VBI),$(VBIPKG_FILENAME).pkg,) \
-        $(if $(VBOX_OSE),,LICENSE) \
+        LICENSE \
         autoresponse \
         ReadMe.txt
@@ -514 +514 @@
                 $(VBOX_PATH_SOL_INST_SRC)/Makefile.kmk \
                 $(if $(VBOX_WITH_SOLARIS_VBI),$(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg,) \
-                $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
-                $(if $(VBOX_OSE),,$(PATH_BIN)/LICENSE) \
+                $(VBOX_BRAND_LICENSE_TXT) \
+                $(PATH_BIN)/LICENSE \
                 $(if $(and $(VBOX_LICENSE_BINS),$(VBOX_WITH_QTGUI)),$(VBOX_LICENSE_BINS),) \
                 $(if $(VBOX_WITH_NETADP),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0,) \
@@ -546 +546 @@
         $(QUIET)$(MKDIR) -p $(SOLARIS_USRSHR_PIXMAPS_DIR)
         $(QUIET)$(if $(VBOX_WITH_NETADP),$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetAdp/solaris/hostname.vboxnet0    $(SOLARIS_ETC_DIR)/hostname.vboxnet0,)
-        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_VBOXINST_DIR)/LICENSE)
-        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_BASEINST_DIR)/vbox.copyright)
-        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_BASEINST_DIR)/LICENSE)
+        $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                                          $(SOLARIS_VBOXINST_DIR)/LICENSE
+        # don't display the license on package install, since 4.0
+        #$(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                                          $(SOLARIS_BASEINST_DIR)/vbox.copyright
+        $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                                          $(SOLARIS_BASEINST_DIR)/LICENSE
 ifdef VBOX_WITH_COMBINED_PACKAGE
  ifndef VBOX_OSE
@@ -738 +739 @@
 $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg: \
                 $(VBOX_VERSION_STAMP) \
-                $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
-                $(if $(VBOX_OSE),,$(PATH_BIN)/LICENSE) \
+                $(VBOX_BRAND_LICENSE_TXT) \
+                $(PATH_BIN)/LICENSE \
                 $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo \
                 $(VBOX_PATH_SOL_INST_SRC)/vbi/makepackage.sh \
@@ -759 +760 @@
                 --output $(SOLARIS_VBI_DIR)/vboxkern.pkginfo \
                 $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo
-        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_VBI_DIR)/vbox.copyright)
+        # don't display the license on package install, since 4.0
+        #$(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                                          $(SOLARIS_VBI_DIR)/vbox.copyright
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/vbi/makepackage.sh                                 $(SOLARIS_VBI_DIR)/makepackage.sh
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_SOL_INST_SRC)/vbi/preremove.sh                                   $(SOLARIS_VBI_DIR)/preremove.sh