From dc202093832299fb42383b18e0da795c398aeecf Mon Sep 17 00:00:00 2001
From: konablend <kona8lend@gmail.com>
Date: Sun, 1 Mar 2009 20:29:06 +0000
Subject: BuildSystem: - added configure --prefix to specify an install
 location - propagated prefix to gtk's aggregated build - value is exposed to
 make as two variables, use either depending on if ending slash is desired    
 $(INSTALL.prefix)     $(INSTALL.prefix/)

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2185 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 make/configure.py        | 14 ++++++++++++++
 make/include/report.defs |  2 ++
 2 files changed, 16 insertions(+)

(limited to 'make')

diff --git a/make/configure.py b/make/configure.py
index 1aa85bd39..421001791 100644
--- a/make/configure.py
+++ b/make/configure.py
@@ -290,9 +290,19 @@ elif guessHost.match( 'powerpc-*-darwin9.*' ):
 else:
     archMode = OptionMode( 0, guessHost.proc )
 
+if guessHost.match( '*-*-darwin*' ):
+    d_prefix = '/Applications'
+else: 
+    d_prefix = '/usr/local'
+
 ## create parser
 parser = OptionParser( 'Usage: %prog' )
 
+group = OptionGroup( parser, 'Installation Options' )
+group.add_option( '', '--prefix', default=d_prefix, action='store',
+    help='install destination for final products (%s)' % (d_prefix) )
+parser.add_option_group( group )
+
 group = OptionGroup( parser, 'Feature Options' )
 group.add_option( '', '--disable-xcode', default=False, action='store_true',
     help='disable Xcode (Darwin only)' )
@@ -627,6 +637,10 @@ config.addBlank()
 config.add( 'BUILD/',   os.curdir + os.sep )
 config.add( 'PROJECT/', project_dir + os.sep )
 
+config.addBlank()
+config.add( 'INSTALL.prefix', options.prefix )
+config.add( 'INSTALL.prefix/', '$(INSTALL.prefix)/' )
+
 config.addBlank()
 config.add( 'FEATURE.xcode', 0 if options.disable_xcode else 1 )
 config.add( 'FEATURE.gtk',   0 if options.disable_gtk   else 1 )
diff --git a/make/include/report.defs b/make/include/report.defs
index 6ff71dc99..858c45523 100644
--- a/make/include/report.defs
+++ b/make/include/report.defs
@@ -36,6 +36,8 @@ $(info #########################################################################
 $(info $(foreach v,$(sort $(filter HB.%,$(.VARIABLES))),$(call fn.PRINTVAR,$v)))
 $(info $(foreach v,$(sort $(filter HOST.%,$(.VARIABLES))),$(call fn.PRINTVAR,$v)))
 $(info $(foreach v,$(sort $(filter BUILD.%,$(.VARIABLES))),$(call fn.PRINTVAR,$v)))
+$(info $(foreach v,$(sort $(filter INSTALL.%,$(.VARIABLES))),$(call fn.PRINTVAR,$v)))
+$(info $(foreach v,$(sort $(filter FEATURE.%,$(.VARIABLES))),$(call fn.PRINTVAR,$v)))
 $(info $(foreach v,$(sort $(filter CONTRIB.%,$(.VARIABLES))),$(call fn.PRINTVAR,$v)))
 $(info )
 endif
-- 
cgit v1.2.3