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

1 files changed, 14 insertions, 0 deletions

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)' )
@@ -628,6 +638,10 @@ 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 )