Changeset 13256 in vbox

Timestamp:

Oct 14, 2008 12:45:10 PM (16 years ago)

Author:

vboxsync

Message:

consolidate this license.html crap

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/linux/Makefile.kmk (modified) (1 diff)
• src/VBox/Installer/solaris/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -3533 +3533 @@
 endif
 -include $(VBOX_LICENSE_VER_KMK)
-VBOX_LICENSE_FILE = License-$(VBOX_LICENSE_VER).html
-VBOX_LICENSE_BIN = $(PATH_BIN)/$(VBOX_LICENSE_FILE)
+VBOX_LICENSE_FILES = \
+        License-$(VBOX_LICENSE_VER).html \
+        $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),License-$(VBOX_LICENSE_VER)-$(f).html)
+VBOX_LICENSE_BINS = $(addprefix $(PATH_BIN)/,$(VBOX_LICENSE_FILES))
 endif
 endif

trunk/Makefile.kmk

@@ -50 +50 @@
  nobin_MODE = 0644
  nobin_SOURCES =
- ifdef VBOX_LICENSE_FILE
+ ifdef VBOX_LICENSE_FILES
   nobin_SOURCES += \
-        $(VBOX_BRAND_LICENSE_HTML)=>$(VBOX_LICENSE_FILE) \
+        $(VBOX_BRAND_LICENSE_HTML)=>$(License-$(VBOX_LICENSE_VER).html) \
         $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),$(VBOX_BRAND_$(f)_LICENSE_HTML)=>License-$(VBOX_LICENSE_VER)-$(f).html)
  endif

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

@@ -160 +160 @@
  VBOX_LNX_NO_STRIP += \
         VirtualBox.desktop \
-        $(if $(VBOX_OSE),,License-$(VBOX_LICENSE_VER).html) \
-        $(if $(VBOX_OSE),,$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),License-$(VBOX_LICENSE_VER)-$(f).html)) \
+        $(VBOX_LICENSE_FILES) \
         $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/libVBox*)),) \
         $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \

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

@@ -135 +135 @@
 SOLARIS_EXTRAS = \
         $(if $(VBOX_OSE),,LICENSE) \
-        $(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_QT4GUI)),License-$(VBOX_LICENSE_VER).html) \
-        $(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_QT4GUI)),$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),License-$(VBOX_LICENSE_VER)-$(f).html)) \
+        $(if $(and $(VBOX_LICENSE_FILES),$(VBOX_WITH_QT4GUI)),$(VBOX_LICENSE_FILES)) \
         $(if $(VBOX_WITH_QT4GUI),VBoxQtconfig,) \
         $(if $(VBOX_WITH_QT4GUI),virtualbox.desktop,) \
@@ -239 +238 @@
                 $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
                 $(if $(VBOX_OSE),,$(PATH_BIN)/LICENSE) \
-                $(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_QT4GUI)),$(PATH_BIN)/License-$(VBOX_LICENSE_VER).html) \
-                $(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_QT4GUI)),$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),$(PATH_BIN)/License-$(VBOX_LICENSE_VER)-$(f).html)) \
+                $(if $(and $(VBOX_LICENSE_BINS),$(VBOX_WITH_QT4GUI)),$(VBOX_LICENSE_BINS),) \
                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf \
                 $(if $(VBOX_WITH_NETFLT),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf) \
@@ -378 +376 @@
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_INST_DIR)/LICENSE)
         $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_BIN)/LICENSE                                        $(SOLARIS_INST_DIR)/vbox.copyright)
-        $(QUIET)$(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_QTGUI)),$(INSTALL) -m 0644 $(PATH_BIN)/License-$(VBOX_LICENSE_VER).html  $(SOLARIS_INST_DIR)/)
-        $(QUIET)$(if $(and $(not $(VBOX_OSE)),$(VBOX_WITH_QTGUI)),$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES),$(INSTALL) -m 0644 $(PATH_BIN)/License-$(VBOX_LICENSE_VER)-$(f).html $(SOLARIS_INST_DIR)/))
+        $(QUIET)$(if $(VBOX_LICENSE_BINS),$(VBOX_WITH_QTGUI),$(INSTALL) -m 0644 $(VBOX_LICENSE_BINS)            $(SOLARIS_INST_DIR)/)
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/components/VBoxXPCOMBase.xpt                                     $(SOLARIS_INST_DIR)/components/VBoxXPCOMBase.xpt
         $(QUIET)$(INSTALL) -m 0644 $(PATH_BIN)/components/VirtualBox_XPCOM.xpt                                  $(SOLARIS_INST_DIR)/components/VirtualBox_XPCOM.xpt