Changeset 13238 in vbox for trunk

Timestamp:

Oct 14, 2008 8:19:42 AM (16 years ago)

Author:

vboxsync

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

37829

Message:

License.txt

Location:

trunk/src/VBox/Installer

Files:

• linux/Makefile.kmk (modified) (2 diffs)
• solaris/Makefile.kmk (modified) (2 diffs)

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

@@ -227 +227 @@
                 $(VBOX_PATH_LNX_INST_SRC)/routines.sh \
                 $(VBOX_PATH_LNX_INST_SRC)/deffiles \
-                $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt) \
+                $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT)) \
                 $(VBOX_LNX_INST_OUT_DIR)/vboxnet.sh \
                 $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh \
@@ -235 +235 @@
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LNX_INST_SRC)/routines.sh          $(VBOX_LNX_INST_STAGE_DIR)/
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_LNX_INST_SRC)/deffiles             $(VBOX_LNX_INST_STAGE_DIR)/
-        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(PATH_ROOT)/doc/License.txt $(VBOX_LNX_INST_STAGE_DIR)/LICENSE)
+        $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(VBOX_BRAND_LICENSE_TXT))   $(VBOX_LNX_INST_STAGE_DIR)/LICENSE)
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_INST_OUT_DIR)/vboxnet.sh            $(VBOX_LNX_INST_STAGE_DIR)/
         $(QUIET)$(INSTALL) -m 0755 $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh            $(VBOX_LNX_INST_STAGE_DIR)/

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

@@ -235 +235 @@
                 $(VBOX_PATH_SOL_INST_SRC)/Makefile.kmk \
                 $(if $(VBOX_WITH_SOLARIS_VBI),$(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg,) \
-                $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt) \
+                $(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) \
@@ -420 +420 @@
 $(SOLARIS_VBI_DIR)/$(VBIPKG_FILENAME).pkg: \
                 $(VBOX_VERSION_STAMP) \
-                $(if $(VBOX_OSE),,$(PATH_ROOT)/doc/License.txt) \
+                $(if $(VBOX_OSE),,$(VBOX_BRAND_LICENSE_TXT) \
                 $(if $(VBOX_OSE),,$(PATH_BIN)/LICENSE) \
                 $(VBOX_PATH_SOL_INST_SRC)/vbi/vboxkern.pkginfo \