Changeset 13245 in vbox

Timestamp:

Oct 14, 2008 10:27:08 AM (17 years ago)

Author:

vboxsync

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

37847

Message:

more VBOX_MANUAL_ADD_LANGUAGES and VBOX_INSTALLER_ADD_LANGUAGES

Location:

trunk/src/VBox/Installer

Files:

• linux/Makefile.kmk (modified) (3 diffs)
• solaris/Makefile.kmk (modified) (4 diffs)

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

@@ -56 +56 @@
                 LICENSE) \
         $(wildcard $(VBOX_LNX_INST_OUT_DIR)/VirtualBox-*) \
-        $(VBOX_LNX_INST_OUT_DIR)/vboxdrv.sh \
-        $(VBOX_LNX_INST_OUT_DIR)/vboxnet.sh \
-        $(VBOX_LNX_INST_OUT_DIR)/install.sh
+        $(addprefix $(VBOX_LNX_INST_OUT_DIR)/,\
+                vboxdrv.sh \
+                vboxnet.sh \
+                install.sh)
 
 #
@@ -160 +161 @@
         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)) \
         $(if $(VBOX_WITH_QT4_SUN),$(notdir $(wildcard $(PATH_BIN)/libVBox*)),) \
         $(if $(VBOX_WITH_QT4_SUN),accessible/libqtaccessiblewidgets.so,) \
@@ -175 +177 @@
 ifdef VBOX_WITH_DOCS_PACKING
  VBOX_LNX_NO_STRIP += \
-        $(notdir $(wildcard $(PATH_BIN)/UserManual*.pdf)) \
-        $(notdir $(wildcard $(PATH_BIN)/VirtualBox*.chm))
+        VirtualBox.chm UserManual.pdf \
+        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),VirtualBox_$(f).chm UserManual_$(f).pdf)
  VBOX_LNX_STRIP_BIN += \
         $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,)

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

@@ -136 +136 @@
         $(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 $(VBOX_WITH_QT4GUI),VBoxQtconfig,) \
         $(if $(VBOX_WITH_QT4GUI),virtualbox.desktop,) \
@@ -164 +165 @@
 ifdef VBOX_WITH_DOCS_PACKING
  SOLARIS_NO_STRIP += \
-        UserManual.pdf
+        UserManual.pdf \
+        $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),UserManual_$(f).pdf)
 endif
 
@@ -238 +240 @@
                 $(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)) \
                 $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf \
                 $(if $(VBOX_WITH_NETFLT),$(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf) \
@@ -371 +374 @@
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/Support/solaris/vboxdrv.conf               $(SOLARIS_INST_DIR)/vboxdrv.conf
         $(QUIET)$(INSTALL) -m 0644 $(PATH_ROOT)/src/VBox/HostDrivers/VBoxNetFlt/solaris/vboxflt.conf            $(SOLARIS_INST_DIR)/vboxflt.conf
-        $(QUIET)$(if $(VBOX_WITH_DOCS_PACKING),$(INSTALL) -m 0644 $(PATH_BIN)/UserManual.pdf $(SOLARIS_INST_DIR)/)
+        $(QUIET)$(if $(VBOX_WITH_DOCS_PACKING),$(INSTALL) -m 0644 $(PATH_BIN)/UserManual.pdf                    $(SOLARIS_INST_DIR)/)
+        $(QUIET)$(if $(VBOX_WITH_DOCS_PACKING),$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(INSTALL) -m 0644 $(PATH_BIN)/UserManual_$(f).pdf $(SOLARIS_INST_DIR/)))
         $(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)/License-$(VBOX_LICENSE_VER).html,)
+        $(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)$(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