From: vsr Date: Fri, 15 Jul 2011 11:30:48 +0000 (+0000) Subject: Merge from V6_3_BR 15/07/2011 X-Git-Tag: V6_4_0a1~15 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=52a63de00ba47f653a63a24b6ae952ce4129e974;p=modules%2Fhomard.git Merge from V6_3_BR 15/07/2011 --- diff --git a/Makefile.am b/Makefile.am index 28447e09..983d3dba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,11 +24,12 @@ # include $(top_srcdir)/adm_local/unix/make_common_starter.am -ACLOCAL_AMFLAGS = -I $(top_srcdir)/adm_local/unix/config_files \ +ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${HOMARD_SRC}/adm_local/unix/config_files - + -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ + -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files + SUBDIRS = idl adm_local resources src doc tests DIST_SUBDIRS = idl adm_local resources src doc tests diff --git a/configure.ac b/configure.ac index 87dde325..9515a1f7 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Modified by : Alexander BORODIN (OCN) - autotools usage # Created from configure.in.base # -AC_INIT([Salome2 Project HOMARD module], [6.3.0], [webmaster.salome@opencascade.com], [SalomeHOMARD]) +AC_INIT([Salome2 Project HOMARD module], [6.3.1], [webmaster.salome@opencascade.com], [SalomeHOMARD]) AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET