diff options
author | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-07-07 18:36:05 +0000 |
---|---|---|
committer | vboxsync <vboxsync@cfe28804-0f27-0410-a406-dd0f0b0b656f> | 2021-07-07 18:36:05 +0000 |
commit | 238aaae1c67ca370e40055ec7af9dc3b53e2d52e (patch) | |
tree | 58625399864b954e5d96da9276a9b68a6dfd247e | |
parent | db2078b2b0931a4185f35a046cbacb7e68e16774 (diff) | |
download | VirtualBox-svn-238aaae1c67ca370e40055ec7af9dc3b53e2d52e.tar.gz |
debian/rules, rpm/rules: Make it listen to VBOX_OUT_BASE for where to put build data.
git-svn-id: https://www.virtualbox.org/svn/vbox/trunk@90080 cfe28804-0f27-0410-a406-dd0f0b0b656f
-rwxr-xr-x | debian/rules | 5 | ||||
-rwxr-xr-x | src/VBox/Installer/linux/debian/rules | 5 | ||||
-rwxr-xr-x | src/VBox/Installer/linux/rpm/rules | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/debian/rules b/debian/rules index 8238c41772c..9f30111f5d4 100755 --- a/debian/rules +++ b/debian/rules @@ -53,8 +53,9 @@ verpkg := virtualbox-ose current := $(shell pwd) vboxroot := $(shell pwd) pkgdir := $(if $(PKGDIR),$(PKGDIR),$(shell cd ..; pwd)) -builddir := $(vboxroot)/out/debian/builddir -moddir := $(vboxroot)/out/debian/modules +bldbase := $(if $(VBOX_OUT_BASE),$(VBOX_OUT_BASE),$(vboxroot))/out/debian +builddir := $(bldbase)/builddir +moddir := $(bldbase)/modules prefix := $(current)/debian/$(verpkg) arch := $(shell dpkg --print-architecture) verfile := $(builddir)/version-generated.mk diff --git a/src/VBox/Installer/linux/debian/rules b/src/VBox/Installer/linux/debian/rules index e64a3e44a6e..b1abc310176 100755 --- a/src/VBox/Installer/linux/debian/rules +++ b/src/VBox/Installer/linux/debian/rules @@ -59,8 +59,9 @@ verpkg := virtualbox-6.1 current := $(shell pwd) vboxroot := $(shell while ! test -r configure && ! test "$PWD" = "/"; do cd ..; done; pwd) pkgdir := $(if $(PKGDIR),$(PKGDIR),$(shell cd $(vboxroot)/..; pwd)) -builddir := $(vboxroot)/out/debian/builddir -moddir := $(vboxroot)/out/debian/modules +bldbase := $(if $(VBOX_OUT_BASE),$(VBOX_OUT_BASE),$(vboxroot))/out/debian +builddir := $(bldbase)/builddir +moddir := $(bldbase)/modules prefix := $(current)/debian/$(verpkg) arch := $(shell dpkg --print-architecture) verfile := $(builddir)/version-generated.mk diff --git a/src/VBox/Installer/linux/rpm/rules b/src/VBox/Installer/linux/rpm/rules index c77e63c0b8a..f2652e53dd9 100755 --- a/src/VBox/Installer/linux/rpm/rules +++ b/src/VBox/Installer/linux/rpm/rules @@ -56,7 +56,7 @@ verpkg := VirtualBox-6.1 current := $(shell pwd) vboxroot := $(shell while ! test -r configure && ! test "$PWD" = "/"; do cd ..; done; pwd) pkgdir := $(if $(PKGDIR),$(PKGDIR),$(shell cd $(vboxroot)/..; pwd)) -bldbase := $(vboxroot)/out/rpm +bldbase := $(if $(VBOX_OUT_BASE),$(VBOX_OUT_BASE),$(vboxroot))/out/rpm builddir := $(bldbase)/builddir stagedir := $(bldbase)/rpmbuild rpmlib := $(shell if [ `uname -m` = "x86_64" ]; then echo "lib64"; else echo "lib"; fi) |