From 21b8445a5733170ce3f671693b958e5141a25774 Mon Sep 17 00:00:00 2001
From: keil <keil>
Date: Sun, 31 Aug 2008 10:59:55 +0000
Subject: [PATCH] - fix library directories - build without root permissions

---
 pppdcapiplugin/Makefile |  2 +-
 vbox/Makefile.in        | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pppdcapiplugin/Makefile b/pppdcapiplugin/Makefile
index 99c91be1..ce81615d 100644
--- a/pppdcapiplugin/Makefile
+++ b/pppdcapiplugin/Makefile
@@ -12,7 +12,7 @@ export TOPDIR=$(shell pwd)
 export CAPIINC=$(TOPDIR)/../capi20
 export CAPILIB=$(TOPDIR)/../capi20
 export INSTALL=$(TOPDIR)/install-sh -c
-export INSTALLDATA=$(TOPDIR)/install-sh -c -o root -m 600
+export INSTALLDATA=$(TOPDIR)/install-sh -c -m 600
 export MKDIR=$(TOPDIR)/mkinstalldirs
 export PPPINC=/usr/include/pppd
 
diff --git a/vbox/Makefile.in b/vbox/Makefile.in
index 1f0a35e0..5004e71e 100644
--- a/vbox/Makefile.in
+++ b/vbox/Makefile.in
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.in,v 1.24 2002/01/31 20:05:40 paul Exp $
+# $Id: Makefile.in,v 1.25 2008/08/31 10:59:55 keil Exp $
 
 #----------------------------------------------------------------------------#
 # Things you can change to personalize the Makefile for your own site. Some  #
@@ -14,33 +14,33 @@
 # [*] Program to install binaries to the sbin directory (eg vboxgetty):      #
 #----------------------------------------------------------------------------#
 
-INSTALL_SBIN	= @INSTALL@ -m 750 -o root -g root -s
+INSTALL_SBIN	= @INSTALL@ -m 750
 
 #----------------------------------------------------------------------------#
 # [*] Program to install binaries to the bin directory (eg vboxconvert):     #
 #----------------------------------------------------------------------------#
 
-INSTALL_BIN	= @INSTALL@ -m 755 -o root -g root -s
+INSTALL_BIN	= @INSTALL@ -m 755
 
 #----------------------------------------------------------------------------#
 # [*] Program to install bash scripts to the bin directory (eg vboxplay):    #
 #----------------------------------------------------------------------------#
 
-INSTALL_SHBIN	= @INSTALL@ -m 755 -o root -g root
+INSTALL_SHBIN	= @INSTALL@ -m 755
 
 #----------------------------------------------------------------------------#
 # [*] Program to install binaries to the bin directory and set the suid bit  #
 #     (eg vboxbeep):                                                         #
 #----------------------------------------------------------------------------#
 
-INSTALL_UBIN	= @INSTALL@ -m 4755 -o root -g root -s
+INSTALL_UBIN	= @INSTALL@ -m 4755
 
 #----------------------------------------------------------------------------#
 # [*] Program to install configurations to sysconf directory                 #
 #     (eg vboxgetty.conf):                                                   #
 #----------------------------------------------------------------------------#
 
-INSTALL_SYSCONF	= @INSTALL@ -m 640 -o root -g root
+INSTALL_SYSCONF	= @INSTALL@ -m 640
 
 #----------------------------------------------------------------------------#
 # [*] Program to create missing directories:                                 #
@@ -80,8 +80,8 @@ prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 mandir		= @CONFIG_MANDIR@
 bindir		= @CONFIG_BINDIR@
-sbindir		= @CONFIG_SBINDIR@
-sysconfdir	= @CONFIG_I4LCONFDIR@
+sbindir		= /usr/sbin
+sysconfdir	= /etc/vbox
 
 LOGFILEDIR	= @VBOX_LOGDIR@
 PIDFILEDIR	= @VBOX_PIDDIR@
@@ -119,6 +119,7 @@ endif
 
 export CC
 export CFLAGS
+export VBOX_CFLAGS
 export LDFLAGS
 export AR
 export RANLIB