[cig-commits] r5976 - in cs/merlin/branches/v1: merlin merlin.egg-info

[leif at geodynamics.org]

Author: leif
Date: 2007-02-07 10:27:24 -0800 (Wed, 07 Feb 2007)
New Revision: 5976

Modified:
   cs/merlin/branches/v1/merlin.egg-info/PKG-INFO
   cs/merlin/branches/v1/merlin/distutils.cfg
Log:
Commented-out the defaults in merlin's 'distutils.cfg', because no one
was using them, and they were causing problems.

As explained in r5213, the merlin default of installing under $HOME is
based upon the assumption that installing as 'root' is the exception,
not the rule.  Unfortunately, the defaults somehow override options
given on the command line.  For example:

    python setup.py install --prefix=$HOME/foo

This command would ignore the 'prefix' option and install the package
under ~/.merlin.  Oddly, the nearly (exactly?) equivalent command,

    python setup.py easy_install --prefix=$HOME/foo .

would work!  I don't understand 'distutils' well enough yet to
understand what is going on here.


Modified: cs/merlin/branches/v1/merlin/distutils.cfg
===================================================================
--- cs/merlin/branches/v1/merlin/distutils.cfg	2007-02-07 17:00:00 UTC (rev 5975)
+++ cs/merlin/branches/v1/merlin/distutils.cfg	2007-02-07 18:27:24 UTC (rev 5976)
@@ -1,5 +1,5 @@
 
-[install]
-install_lib = ~/.merlin/lib/python$py_version_short
-install_scripts = ~/bin
+#[install]
+#install_lib = ~/.merlin/lib/python$py_version_short
+#install_scripts = ~/bin
 

Modified: cs/merlin/branches/v1/merlin.egg-info/PKG-INFO
===================================================================
--- cs/merlin/branches/v1/merlin.egg-info/PKG-INFO	2007-02-07 17:00:00 UTC (rev 5975)
+++ cs/merlin/branches/v1/merlin.egg-info/PKG-INFO	2007-02-07 18:27:24 UTC (rev 5976)
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: merlin
-Version: 1.0
+Version: 1.1
 Summary: A custom version of Phillip J. Eby's setuptools.
 Home-page: http://www.geodynamics.org/cig/software/packages/cs/pythia/
 Author: Leif Strand