From 8a976ac936dddcd1a0e40944517593591b2e5690 Mon Sep 17 00:00:00 2001
From: utahta <pokusa112@gmail.com>
Date: Sun, 24 Oct 2010 17:38:35 +0900
Subject: [PATCH] rename --build-options to --configure

---
 README.rst    | 14 +++++++-------
 pythonbrew    | 11 ++++++-----
 pythonbrew.py | 11 ++++++-----
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/README.rst b/README.rst
index 5a254bd..f9315b7 100644
--- a/README.rst
+++ b/README.rst
@@ -37,11 +37,11 @@ Install some Pythons::
 
   pythonbrew install Python-3.1.2
   pythonbrew install Python-2.6.6
-  pythonbrew install --build-options="CC=gcc_4.1" Python-2.6.6
+  pythonbrew install --configure="CC=gcc_4.1" Python-2.6.6
   pythonbrew install --no-setuptools Python-2.6.6
   pythonbrew install http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tgz
   pythonbrew install /path/to/Python-2.6.6.tgz
-    
+  
 Switch python in the $PATH::
 
   pythonbrew switch Python-2.6.6
@@ -81,7 +81,7 @@ install Python-<version>
   
   Setuptools and pip is automatically installed.
   
-  options: --force, --no-setuptools or --build-options.
+  options: --force, --no-setuptools and --configure.
 
 installed
   List the installed versions of python.
@@ -110,11 +110,11 @@ version
 Options
 =======
 
-\-f --force
+\-f|--force
   Force installation of a Python.
 
-\-b --build-options
-  Configure options of Python.
+\-C|--configure
+  Custom configure options.
 
-\-n --no-setuptools
+\-n|--no-setuptools
   Skip installation of setuptools.
diff --git a/pythonbrew b/pythonbrew
index 96ffbe5..b6825a0 100755
--- a/pythonbrew
+++ b/pythonbrew
@@ -298,10 +298,11 @@ class InstallCommand(Command):
             help="Force installation of a Python."
         )
         self.parser.add_option(
-            "-b", "--build-options",
-            dest="build_options",
+            "-C", "--configure",
+            dest="configure",
             default="",
-            help="Set configure options."
+            metavar="CONFIGURE_OPTIONS",
+            help="Custom configure options."
         )
         self.parser.add_option(
             "-n", "--no-setuptools",
@@ -429,7 +430,7 @@ And follow the instruction on screen."""
         pkgname = splitext(basename)[0]
         
         install_dir = "%s/%s" % (PATH_PYTHONS, pkgname)
-        build_options = "--prefix=%s %s" % (install_dir, options.build_options)
+        configure = "--prefix=%s %s" % (install_dir, options.configure)
         print "Installing %s into %s" % (pkgname, install_dir);
         print """This could take a while. You can run the following command on another shell to track the status:
 
@@ -440,7 +441,7 @@ And follow the instruction on screen."""
             s.check_call(self._get_uncompress_command(basename))
             
             s.chdir("%s/%s" % (PATH_BUILD, pkgname))
-            s.check_call("./configure %s" % (build_options))
+            s.check_call("./configure %s" % (configure))
             if options.force:
                 s.check_call("make")
                 s.check_call("make install")
diff --git a/pythonbrew.py b/pythonbrew.py
index 96ffbe5..b6825a0 100755
--- a/pythonbrew.py
+++ b/pythonbrew.py
@@ -298,10 +298,11 @@ class InstallCommand(Command):
             help="Force installation of a Python."
         )
         self.parser.add_option(
-            "-b", "--build-options",
-            dest="build_options",
+            "-C", "--configure",
+            dest="configure",
             default="",
-            help="Set configure options."
+            metavar="CONFIGURE_OPTIONS",
+            help="Custom configure options."
         )
         self.parser.add_option(
             "-n", "--no-setuptools",
@@ -429,7 +430,7 @@ And follow the instruction on screen."""
         pkgname = splitext(basename)[0]
         
         install_dir = "%s/%s" % (PATH_PYTHONS, pkgname)
-        build_options = "--prefix=%s %s" % (install_dir, options.build_options)
+        configure = "--prefix=%s %s" % (install_dir, options.configure)
         print "Installing %s into %s" % (pkgname, install_dir);
         print """This could take a while. You can run the following command on another shell to track the status:
 
@@ -440,7 +441,7 @@ And follow the instruction on screen."""
             s.check_call(self._get_uncompress_command(basename))
             
             s.chdir("%s/%s" % (PATH_BUILD, pkgname))
-            s.check_call("./configure %s" % (build_options))
+            s.check_call("./configure %s" % (configure))
             if options.force:
                 s.check_call("make")
                 s.check_call("make install")