[cig-commits] commit: merge 1.4.x

[Mercurial]

changeset:   236:36fe68379dae
parent:      234:ea6dd609b696
parent:      235:2989f7a758b7
user:        John Mansour <john.mansour at maths.monash.edu.au>
date:        Fri Jan 08 12:11:55 2010 +1100
description:
merge 1.4.x


diff -r ea6dd609b696 -r 36fe68379dae SConfigure
--- a/SConfigure	Fri Jan 08 08:31:19 2010 +1100
+++ b/SConfigure	Fri Jan 08 12:11:55 2010 +1100
@@ -66,6 +66,9 @@ if not (GetOption('help') or GetOption('
 
     if env.get('prefix', None) is None:
         env['prefix'] = env.GetLaunchDir()
+    else:
+	print("prefix specification is currently disabled.  you may use --build-dir as an alternative.");
+	env.Exit()
 
     if env.get('eptiming', None):
         env.MergeFlags('-DENABLE_STGERMAIN_LOG')