Changeset 35216 in vbox

Timestamp:

Dec 17, 2010 10:33:39 AM (14 years ago)

Author:

vboxsync

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

69058

Message:

Config.kmk: if there is no license version defined there's no need to install/package the associated files

Location:

trunk

Files:

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

trunk/Config.kmk

@@ -4578 +4578 @@
   endif
   -include $(VBOX_LICENSE_VER_KMK)
-  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))
+  ifdef VBOX_LICENSE_VER
+   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
 endif

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

@@ -288 +288 @@
         components/VBoxXPCOMBase.xpt \
         components/VirtualBox_XPCOM.xpt \
-        $(if $(and $(VBOX_LICENSE_FILES),$(VBOX_WITH_QTGUI)),$(VBOX_LICENSE_FILES)) \
+        $(if $(and $(VBOX_LICENSE_FILES),$(VBOX_WITH_QTGUI)),$(VBOX_LICENSE_FILES))
 
 SOLARIS_USRBIN_LINKS = \