Merge from V6_4_BR 05/12/2011

diff --git a/Examples/ast1/myaster/Makefile b/Examples/ast1/myaster/Makefile
index 92341c9fffff715d9fbff716a99c0d227388e7a5..bf2950d2ab9c5a4c63f171721f25302e7fcf7c71 100644 (file)
--- a/Examples/ast1/myaster/Makefile
+++ b/Examples/ast1/myaster/Makefile
@@ -19,8 +19,6 @@
 
 include ../../makefile.inc
 
-MED2HOME=/local/cchris/pkg/med235/install
-
 ASTER_INSTALL=$(ASTER_ROOT)/$(ASTER_VERSION)
 ASTER_PUB=$(ASTER_ROOT)/public
 ASTER_OUTILS=$(ASTER_ROOT)/outils

diff --git a/Examples/makefile.inc b/Examples/makefile.inc
index 7bf24a20cbc88c9e5e0ae74224f122ed620cb602..b6e84509a02d892592160f0ec738205bd4fb51c9 100644 (file)
--- a/Examples/makefile.inc
+++ b/Examples/makefile.inc
@@ -18,6 +18,7 @@
 #
 
 KERNEL_ROOT_DIR=$(HOME)/Salome/Install/KERNEL_V6
+MED2HOME=/temp
 
 ASTER_ROOT=$(HOME)/Aster/V10.3/aster
 ASTER_VERSION=STA10.3

diff --git a/setup.py b/setup.py
index 8fa5a25d512c14fb22def35103cb9a4e1ed83b59..6d245dda6417065c721c4a9709b0223da00cc8dd 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
 
 from distutils.core import setup
 setup(name='YACSGEN',
-      version='6.3.1',
+      version='6.4.0',
       author='C. Caremoli',
       packages=['module_generator'],
      )