diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2010-05-08 14:05:01 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2010-05-08 14:05:01 +0200 |
| commit | 33961db1e2718be932cefe0b32aae173ae760cea (patch) | |
| tree | 800f8bf4b1d5e4b9505a30270f0c170342abb43d /src/VBox/Installer/linux | |
| parent | 4749e3a0c5d3a159d3ae751e6780b537c860923a (diff) | |
| download | virtualbox-33961db1e2718be932cefe0b32aae173ae760cea.tar.gz | |
Imported Upstream version 3.1.52-dfsgupstream/3.1.52-dfsg
Diffstat (limited to 'src/VBox/Installer/linux')
| -rw-r--r-- | src/VBox/Installer/linux/Makefile.kmk | 11 | ||||
| -rw-r--r-- | src/VBox/Installer/linux/virtualbox.desktop | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/VBox/Installer/linux/Makefile.kmk b/src/VBox/Installer/linux/Makefile.kmk index 0ece7a535..6270ed4e0 100644 --- a/src/VBox/Installer/linux/Makefile.kmk +++ b/src/VBox/Installer/linux/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 28800 2010-04-27 08:22:32Z vboxsync $ +# $Id: Makefile.kmk 29023 2010-05-04 14:05:50Z vboxsync $ ## @file # Makefile for the Linux installer. # @@ -122,6 +122,7 @@ VBOX_LNX_STRIP_BIN = \ VBoxTestOGL \ VBoxSharedCrOpenGL.so,) \ $(if $(VBOX_WITH_PYTHON),$(notdir $(wildcard $(PATH_BIN)/VBoxPython*.so)),) \ + $(if $(VBOX_WITH_JXPCOM),libvboxjxpcom.so,) \ VBoxTunctl # Do not remove relocation information of these binaries @@ -212,6 +213,12 @@ ifdef VBOX_WITH_PYTHON sdk/installer/vboxapi/VirtualBox_constants.py endif +# Java XPCOM bridge +ifdef VBOX_WITH_JXPCOM + VBOX_LNX_NO_STRIP += \ + sdk/bindings/xpcom/java/vboxjxpcom.jar +endif + # Headless ifdef VBOX_WITH_HEADLESS VBOX_LNX_STRIP_BIN += \ @@ -380,6 +387,8 @@ BLDDIRS += $(foreach d,\ archive/sdk/bindings/xpcom/python/xpcom \ archive/sdk/bindings/xpcom/python/xpcom/client \ archive/sdk/bindings/xpcom/python/xpcom/server,) \ + $(if $(VBOX_WITH_JXPCOM),\ + archive/sdk/bindings/xpcom/java,) \ archive/additions \ install\ ,$(VBOX_LNX_INST_OUT_DIR)/$(d)/) diff --git a/src/VBox/Installer/linux/virtualbox.desktop b/src/VBox/Installer/linux/virtualbox.desktop index 61d0a84c7..c05588dc0 100644 --- a/src/VBox/Installer/linux/virtualbox.desktop +++ b/src/VBox/Installer/linux/virtualbox.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Version=1.0 -Name=Sun VirtualBox +Name=Oracle VM VirtualBox GenericName=Virtual Machine Type=Application Exec=VirtualBox |