Changeset 63645 in vbox

Timestamp:

Aug 26, 2016 9:07:29 AM (8 years ago)

Author:

vboxsync

Message:

Linux installer: allow to overwrite the (fixed) installation directory (default remains /opt/VirtualBox)

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (3 diffs)
• install.sh (modified) (2 diffs)

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

@@ -34 +34 @@
 # Globals and targets.
 #
+VBOX_LNX_APP_PRIVATE    := $(if $(VBOX_PATH_APP_PRIVATE),$(VBOX_PATH_APP_PRIVATE),/opt/VirtualBox)
+VBOX_LNX_APP_DOCS       := $(if $(VBOX_PATH_PACKAGE_DOCS),$(VBOX_PATH_PACKAGE_DOCS),\
+                             $(if $(VBOX_PATH_APP_DOCS),$(VBOX_PATH_APP_DOCS),/opt/VirtualBox))
 VBOX_PATH_LNX_INST_SRC  := $(PATH_SUB_CURRENT)
 VBOX_LNX_INST_OUT_DIR   := $(PATH_TARGET)/Installer/linux
 VBOX_LNX_INST_STAGE_DIR := $(PATH_TARGET)/Installer/linux/install
 VBOX_LNX_INST_STAGE_DIR_REL := obj/Installer/linux/install
-VBOX_LNX_DBG_PATH       := usr/lib/debug/opt/VirtualBox
+VBOX_LNX_DBG_PATH       := usr/lib/debug/$(VBOX_LNX_APP_PRIVATE)
 VBOX_LNX_PACKAGE_NAME    = VirtualBox-$(VBOX_VERSION_STRING)-r$(VBOX_SVN_REV).run
 
@@ -117 +120 @@
 $$(linux-misc_0_OUTDIR)/virtualbox.desktop: $(VBOX_PATH_INST_COMMON_SRC)/virtualbox.desktop.in $(VBOX_VERSION_STAMP) | $$(dir $$@)
         $(call MSG_GENERATE,,$@,$<)
-ifdef VBOX_PATH_PACKAGE_DOCS
-        $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_PATH_PACKAGE_DOCS)+" \
+        $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+$(VBOX_LNX_APP_DOCS)+" \
                 -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
                 --output $@ $<
-else
-        $(QUIET)$(SED) -e "s+@VBOX_DOC_PATH@+/opt/VirtualBox+" \
-                -e "s+@VBOX_PRODUCT@+$(VBOX_PRODUCT)+" \
-                --output $@ $<
-endif
 
 INSTALLS += linux-icons
@@ -412 +409 @@
                 -e "s;_BUILDTYPE_;$(KBUILD_TYPE);g" \
                 -e "s;_USERNAME_;$(USERNAME);g" \
+                -e "s;_INSTALLATION_DIR_;$(VBOX_LNX_APP_PRIVATE);g" \
                 -e "s;_PYTHON_;$(VBOX_WITH_PYTHON);g" \
                 --output $@ \

trunk/src/VBox/Installer/linux/install.sh

@@ -36 +36 @@
 DEFAULT_FILES=`pwd`/deffiles
 GROUPNAME="vboxusers"
-INSTALLATION_DIR="/opt/VirtualBox"
+INSTALLATION_DIR="_INSTALLATION_DIR_"
 LICENSE_ACCEPTED=""
 PREV_INSTALLATION=""
@@ -181 +181 @@
                 usage
             fi
-            info "Specifying an installation path is not allowed -- using /opt/VirtualBox!"
+            info "Specifying an installation path is not allowed -- using _INSTALLATION_DIR_!"
             ;;
     esac