[cig-commits] r7563 - in cs/merlin/branches/v1: . merlin/command

[leif at geodynamics.org]

Author: leif
Date: 2007-06-29 16:54:50 -0700 (Fri, 29 Jun 2007)
New Revision: 7563

Modified:
   cs/merlin/branches/v1/merlin/command/egg_flags.py
   cs/merlin/branches/v1/setup.py
Log:
Added LIBS and PYXFLAGS to the "config.cfg" egg metadata -- for
Exchanger and PyLith, respectively.


Modified: cs/merlin/branches/v1/merlin/command/egg_flags.py
===================================================================
--- cs/merlin/branches/v1/merlin/command/egg_flags.py	2007-06-29 23:20:21 UTC (rev 7562)
+++ cs/merlin/branches/v1/merlin/command/egg_flags.py	2007-06-29 23:54:50 UTC (rev 7563)
@@ -51,6 +51,8 @@
             CFLAGS = [],
             CPPFLAGS = [],
             LDFLAGS = [],
+            LIBS = [],
+            PYXFLAGS = [],
             )
 
         requirements = [self.dist.as_requirement()]

Modified: cs/merlin/branches/v1/setup.py
===================================================================
--- cs/merlin/branches/v1/setup.py	2007-06-29 23:20:21 UTC (rev 7562)
+++ cs/merlin/branches/v1/setup.py	2007-06-29 23:54:50 UTC (rev 7563)
@@ -19,7 +19,7 @@
 d = {}; execfile(convert_path('merlin/command/__init__.py'), d)
 SETUP_COMMANDS = d['__all__']
 
-VERSION = "1.2"
+VERSION = "1.3"
 from merlin import setup, find_packages
 import sys
 scripts = []