[gnue] r9682 - trunk/gnue-common/src/setup

Author: reinhard
Date: 2007-06-06 07:44:35 -0500 (Wed, 06 Jun 2007)
New Revision: 9682

Modified:
   trunk/gnue-common/src/setup/GSetup.py
Log:
Allow all install_* options so package creation tools can do an installation to
a fake destination as they like.


Modified: trunk/gnue-common/src/setup/GSetup.py
===================================================================
--- trunk/gnue-common/src/setup/GSetup.py	2007-06-06 11:57:45 UTC (rev 9681)
+++ trunk/gnue-common/src/setup/GSetup.py	2007-06-06 12:44:35 UTC (rev 9682)
@@ -158,23 +158,26 @@
 
 class install (distutils.command.install.install):
 
-  user_options = distutils.command.install.install.user_options
+  # Commented out because sometimes, to create packages, we want to install
+  # other tools in a different target directory than common is installed
+  #user_options = distutils.command.install.install.user_options
 
-  allowed_options = ["root=", "compile", "no-compile", "optimize=", "force",
-                     "skip-build", "record="]
+  #allowed_options = ["root=", "compile", "no-compile", "optimize=", "force",
+  #                   "skip-build", "record="]
 
-  user_options = [opt for opt in user_options if opt [0] in allowed_options]
+  #user_options = [opt for opt in user_options if opt [0] in allowed_options]
 
   # ---------------------------------------------------------------------------
   # Finalize options - set all install targets
   # ---------------------------------------------------------------------------
 
   def finalize_options (self):
-    self.install_lib     = gnue.paths.lib
-    self.install_scripts = gnue.paths.scripts
-    self.install_data    = gnue.paths.data
-    self.install_config  = gnue.paths.config
 
+    if self.install_lib     is None: self.install_lib     = gnue.paths.lib
+    if self.install_scripts is None: self.install_scripts = gnue.paths.scripts
+    if self.install_data    is None: self.install_data    = gnue.paths.data
+    if self.install_config  is None: self.install_config  = gnue.paths.config
+
     distutils.command.install.install.finalize_options (self)
 
   # ---------------------------------------------------------------------------