Renamed many options to be consistent across commands.

Tweaked some help strings to be consistent with documentation.
Don't call 'set_final_options()' in 'run()' anymore -- that's now
  guaranteed to be taken care of for us by the Distribution instance.

1 files changed, 4 insertions, 5 deletions

diff --git a/Lib/distutils/command/install_ext.py b/Lib/distutils/command/install_ext.py
index 360a802..3fb756c 100644
--- a/Lib/distutils/command/install_ext.py
+++ b/Lib/distutils/command/install_ext.py
@@ -11,28 +11,27 @@ from distutils.util import copy_tree
 
 class InstallExt (Command):
 
-    options = [('dir=', 'd', "directory to install to"),
+    options = [('install-dir=', 'd', "directory to install to"),
                ('build-dir=','b', "build directory (where to install from)"),
               ]
 
     def set_default_options (self):
         # let the 'install' command dictate our installation directory
-        self.dir = None
+        self.install_dir = None
         self.build_dir = None
 
     def set_final_options (self):
         self.set_undefined_options ('install',
                                     ('build_platlib', 'build_dir'),
-                                    ('install_site_platlib', 'dir'))
+                                    ('install_site_platlib', 'install_dir'))
 
     def run (self):
-        self.set_final_options ()
 
         # Dump the entire "build/platlib" directory (or whatever it really
         # is; "build/platlib" is the default) to the installation target
         # (eg. "/usr/local/lib/python1.5/site-packages").  Note that
         # putting files in the right package dir is already done when we
         # build.
-        outfiles = self.copy_tree (self.build_dir, self.dir)
+        outfiles = self.copy_tree (self.build_dir, self.install_dir)
 
 # class InstallExt