diff --git a/Makefile b/Makefile index e51e43f72a7316c0c10e17e90a6a3f57c6b6f248..40d8efcb3a71a1b7f541241ce5a96b7720d0e282 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.490 2008-07-04 22:43:37 geuzaine Exp $ +# $Id: Makefile,v 1.491 2008-07-04 22:45:19 geuzaine Exp $ # # Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle # @@ -24,7 +24,7 @@ include variables GMSH_MAJOR_VERSION = 2 GMSH_MINOR_VERSION = 2 GMSH_PATCH_VERSION = 3 -GMSH_EXTRA_VERSION = "-cvs-20080705" +GMSH_EXTRA_VERSION = GMSH_VERSION = ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}${GMSH_EXTRA_VERSION} diff --git a/configure.in b/configure.in index 810961a02e7cc54a1d45cb5f40dcdbd04466d59f..4f03b7d2f5d0a64e1b980be74f8495bc709eb137 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.161 2008-07-04 15:17:45 geuzaine Exp $ +dnl $Id: configure.in,v 1.162 2008-07-04 22:43:37 geuzaine Exp $ dnl dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle dnl @@ -231,9 +231,9 @@ esac dnl Choose to build the GUI or the batch version if test "x$enable_gui" != "xno"; then - GMSH_DIRS="Common Geo Mesh Post Numeric Parser Plugin Graphics Fltk" - GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshPlugin -lGmshMesh" - GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshPost -lGmshCommon -lGmshNumeric" + GMSH_DIRS="Common Geo Mesh Post Plugin Numeric Parser Graphics Fltk" + GMSH_LIBS="-Llib -lGmshFltk -lGmshCommon -lGmshGeo -lGmshMesh -lGmshPost -lGmshPlugin" + GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshGraphics -lGmshParser -lGmshNumeric" FLAGS="-DHAVE_FLTK ${FLAGS}" if test "x${FLTK_PREFIX}" != "x" ; then