From 88946d5c9b1e0f56bb4474d0408d60c5916e42c4 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 5 May 2013 22:55:16 +0000 Subject: [PATCH] Add support for DESTDIR installs --- SConstruct | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 2aa403f95..1f83e993f 100644 --- a/SConstruct +++ b/SConstruct @@ -9,7 +9,7 @@ class argumentIndirection: def __init__(self,prefix): self.prefix = prefix self.ARGUMENTS = ARGUMENTS - def get(self,name,value): + def get(self,name,value=None): return self.ARGUMENTS.get('%s_%s' % (self.prefix, name), self.ARGUMENTS.get(name,value)) # endianess-checker @@ -30,6 +30,7 @@ class DXXCommon: # Paths for the Videocore libs/includes on the Raspberry Pi self.RPI_DEFAULT_VC_PATH='/opt/vc' self.debug = int(ARGUMENTS.get('debug', 0)) + self.DESTDIR = ARGUMENTS.get('DESTDIR') self.profiler = int(ARGUMENTS.get('profiler', 0)) self.opengl = int(ARGUMENTS.get('opengl', 1)) self.asm = int(ARGUMENTS.get('asm', 0)) @@ -362,8 +363,9 @@ class DXXProgram(DXXCommon): env.Program(target='%s%s' % (self.user_settings.builddir, str(exe_target)), source = objects, LIBS = self.platform_settings.libs, LINKFLAGS = str(self.platform_settings.lflags)) if (sys.platform != 'darwin'): if self.user_settings.register_install_target: - env.Install(self.user_settings.BIN_DIR, str(exe_target)) - env.Alias('install', self.user_settings.BIN_DIR) + install_dir = os.path.join(self.user_settings.DESTDIR, self.user_settings.BIN_DIR) + env.Install(install_dir, str(exe_target)) + env.Alias('install', install_dir) else: sys.path += ['./arch/cocoa'] import tool_bundle