diff options
| -rwxr-xr-x | debian/rules | 4 | ||||
| -rwxr-xr-x | src/VBox/Installer/linux/debian/rules | 4 | ||||
| -rwxr-xr-x | src/VBox/Installer/linux/rpm/rules | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules index 7b8a1204d5a..2f883462a13 100755 --- a/debian/rules +++ b/debian/rules @@ -66,7 +66,7 @@ NOQT ?= $(HEADLESS) NOSDL ?= $(HEADLESS) NOWEBSVC ?= EFI ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxEFI32.fd $(vboxroot)/prebuild/VBoxEFI64.fd),1,) -NODOCS ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc)),1,) +NODOCS ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual*.qhc)),1,) STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,) NOWINE := $(if $(STAGEDISO),1,$(ose)) PYTHON := $(firstword $(shell which python3) $(shell which python)) @@ -136,7 +136,7 @@ $(bldbase)/build-stamp $(verfile): $(bldbase)/configure-stamp . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all # Files from prebuild go to (builddir)/bin to be used during the # packing stage, overriding what the build did/would produce. - $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc) $(builddir)/bin,) + $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual*.qhc) $(builddir)/bin,) $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,) $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,) mkdir -p $(builddir)/bin/additions diff --git a/src/VBox/Installer/linux/debian/rules b/src/VBox/Installer/linux/debian/rules index dc4a0226417..25d153fc38d 100755 --- a/src/VBox/Installer/linux/debian/rules +++ b/src/VBox/Installer/linux/debian/rules @@ -75,7 +75,7 @@ NOQT ?= $(HEADLESS) NOSDL ?= $(HEADLESS) NOWEBSVC ?= EFI ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxEFI32.fd $(vboxroot)/prebuild/VBoxEFI64.fd),1,) -NODOCS ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc)),1,) +NODOCS ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual*.qhc)),1,) STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,) NOWINE := $(if $(STAGEDISO),1,$(ose)) PYTHON := $(firstword $(shell which python3) $(shell which python)) @@ -161,7 +161,7 @@ $(bldbase)/build-stamp $(verfile): $(bldbase)/configure-stamp . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all # Files from prebuild go to (builddir)/bin to be used during the # packing stage, overriding what the build did/would produce. - $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc) $(builddir)/bin,) + $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual*.qhc) $(builddir)/bin,) $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,) $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,) mkdir -p $(builddir)/bin/additions diff --git a/src/VBox/Installer/linux/rpm/rules b/src/VBox/Installer/linux/rpm/rules index 7810b013308..4adc9a70e6d 100755 --- a/src/VBox/Installer/linux/rpm/rules +++ b/src/VBox/Installer/linux/rpm/rules @@ -65,7 +65,7 @@ NOQT ?= $(HEADLESS) NOSDL ?= $(HEADLESS) NOWEBSVC ?= EFI ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxEFI32.fd $(vboxroot)/prebuild/VBoxEFI64.fd),1,) -NODOCS ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc)),1,) +NODOCS ?= $(if $(wildcard $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual*.qhc)),1,) STAGEDISO ?= $(if $(wildcard $(vboxroot)/prebuild/VBoxGuestAdditions.iso),$(vboxroot)/prebuild,) NOWINE := $(if $(STAGEDISO),1,$(ose)) @@ -200,7 +200,7 @@ $(bldbase)/build-stamp $(verfile): $(bldbase)/configure-stamp . $(bldbase)/env.sh && kmk -C $(vboxroot) $(bld_flags) $(if $(NOPARALLEL),-j1,) all # Files from prebuild go to (builddir)/bin to be used during the # packing stage, overriding what the build did/would produce. - $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual.qhc) $(builddir)/bin,) + $(if $(NODOCS),cp $(addprefix $(vboxroot)/prebuild/,UserManual*.pdf UserManual*.qch UserManual*.qhc) $(builddir)/bin,) $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI32.fd $(builddir)/bin,) $(if $(EFI),cp $(vboxroot)/prebuild/VBoxEFI64.fd $(builddir)/bin,) mkdir -p $(builddir)/bin/additions |