Changeset 33316 in vbox

Timestamp:

Oct 21, 2010 3:57:58 PM (14 years ago)

Author:

vboxsync

Message:

no ORIGIN for Linux packages anymore

File:

• trunk/Config.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -568 +568 @@
  if1of ($(KBUILD_TARGET), solaris)
   VBOX_PATH_APP_PRIVATE      = /opt/VirtualBox/$(if-expr $(KBUILD_TARGET_ARCH) == "amd64",amd64,i386)
+ else ifeq ($(KBUILD_TARGET),linux)
+  VBOX_PATH_APP_PRIVATE      = /opt/VirtualBox
  else ifeq ($(KBUILD_TARGET),darwin)
   VBOX_PATH_APP_PRIVATE      = /Applications/VirtualBox.app/Contents/MacOS
@@ -600 +602 @@
 #VBOX_WITH_RUNPATH = /usr/lib/virtualbox
 ifdef VBOX_WITH_HARDENING
- if1of ($(KBUILD_TARGET), freebsd solaris)
+ if1of ($(KBUILD_TARGET), freebsd linux solaris)
   VBOX_WITH_RUNPATH = $(VBOX_PATH_APP_PRIVATE)
  endif
@@ -608 +610 @@
 # things gets a bit complicated since the $ORIGIN+setuid policy differs.
 #VBOX_WITH_ORIGIN=1
-ifdef VBOX_WITH_HARDENING
- if1of ($(KBUILD_TARGET), linux)
+ifndef VBOX_WITH_HARDENING
+ if1of ($(KBUILD_TARGET), linux solaris)
   VBOX_WITH_ORIGIN = 1
  endif
-else if1of ($(KBUILD_TARGET), linux solaris)
- VBOX_WITH_ORIGIN = 1
 endif
 # Enable the system wide support service/daemon.