[cig-commits] r6360 - in long/3D/Gale/trunk: . python/Gale

[walter at geodynamics.org]

Author: walter
Date: 2007-03-22 21:17:29 -0700 (Thu, 22 Mar 2007)
New Revision: 6360

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/python/Gale/Configure.py
Log:
 r1733 at earth:  boo | 2007-03-22 12:46:49 -0700
 Make the install default to the current directory



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1730
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1733

Modified: long/3D/Gale/trunk/python/Gale/Configure.py
===================================================================
--- long/3D/Gale/trunk/python/Gale/Configure.py	2007-03-22 23:20:39 UTC (rev 6359)
+++ long/3D/Gale/trunk/python/Gale/Configure.py	2007-03-23 04:17:29 UTC (rev 6360)
@@ -22,7 +22,7 @@
 # localstatedir, sbindir, sharedstatedir, sysconfdir, and maybe
 # oldincludedir.  But it should all be moved into BuildSystem proper.
 
-    help.addArgument('Install', '-prefix=<path>',            nargs.Arg(None, '/usr/local', 'Specify location to install Gale (eg. /usr/local)'))
+    help.addArgument('Install', '-prefix=<path>',            nargs.Arg(None, '', 'Specify location to install Gale (eg. /usr/local)'))
     help.addArgument('Install', '-exec_prefix=<path>',
                      nargs.Arg(None, '${prefix}',
                                'Specify location to install Gale (eg. /usr/local)'))
@@ -82,10 +82,9 @@
 
   def configureInstall(self):
     '''Setup the directories for installation'''
-    if self.framework.argDB['prefix']:
-      self.installdir = self.framework.argDB['prefix']
-    else:
-      self.installdir = self.petscdir.dir
+    if not self.framework.argDB['prefix']:
+      self.framework.argDB['prefix']=os.getcwd()
+    self.installdir = self.framework.argDB['prefix']
     return
 
   def configureGCOV(self):