From 41755f3ad9c87ba56f9298d48681dedc444322ef Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 5 Dec 2011 11:57:56 +0000 Subject: [PATCH] Merge from V6_4_BR 05/12/2011 --- Examples/ast1/myaster/Makefile | 2 -- Examples/makefile.inc | 1 + setup.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Examples/ast1/myaster/Makefile b/Examples/ast1/myaster/Makefile index 92341c9..bf2950d 100644 --- 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 7bf24a2..b6e8450 100644 --- 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 8fa5a25..6d245dd 100644 --- 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'], ) -- 2.39.2