diff --git a/bin/VERSION.in b/bin/VERSION.in index 33c708f57..2fc977aac 100755 --- a/bin/VERSION.in +++ b/bin/VERSION.in @@ -1,3 +1,3 @@ -[SALOME GEOM] : @VERSION@ -[DEVELOPMENT] : @VERSION_DEV@ +[SALOME GEOM] : @SALOMEGEOM_VERSION@ +[DEVELOPMENT] : @SALOMEGEOM_VERSION_DEV@ [DESCRIPTION] : SALOME Geometry module diff --git a/doc/docutils/conf.py.in b/doc/docutils/conf.py.in index ab0f94d07..a7606ba24 100644 --- a/doc/docutils/conf.py.in +++ b/doc/docutils/conf.py.in @@ -54,9 +54,9 @@ copyright = '2010 EDF R&D' # built documents. # # The short X.Y version. -version = '@VERSION@' +version = '@SALOMEGEOM_VERSION@' # The full version, including alpha/beta/rc tags. -release = '@VERSION@' +release = '@SALOMEGEOM_VERSION@' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/salome/gui/GEOM/static/header.html.in b/doc/salome/gui/GEOM/static/header.html.in index cd9329091..e8fca9699 100755 --- a/doc/salome/gui/GEOM/static/header.html.in +++ b/doc/salome/gui/GEOM/static/header.html.in @@ -19,5 +19,5 @@ $extrastylesheet
-
Version: @VERSION@
+
Version: @SALOMEGEOM_VERSION@
diff --git a/doc/salome/gui/GEOM/static/header_py.html.in b/doc/salome/gui/GEOM/static/header_py.html.in index 7b68cef81..d5ce9cb6f 100644 --- a/doc/salome/gui/GEOM/static/header_py.html.in +++ b/doc/salome/gui/GEOM/static/header_py.html.in @@ -19,6 +19,6 @@ $extrastylesheet
-
Version: @VERSION@
+
Version: @SALOMEGEOM_VERSION@
Home
diff --git a/doc/salome/tui/static/header.html.in b/doc/salome/tui/static/header.html.in index cd9329091..e8fca9699 100755 --- a/doc/salome/tui/static/header.html.in +++ b/doc/salome/tui/static/header.html.in @@ -19,5 +19,5 @@ $extrastylesheet
-
Version: @VERSION@
+
Version: @SALOMEGEOM_VERSION@
diff --git a/resources/GEOMCatalog.xml.in b/resources/GEOMCatalog.xml.in index 22e8b1666..00803d946 100644 --- a/resources/GEOMCatalog.xml.in +++ b/resources/GEOMCatalog.xml.in @@ -69,7 +69,7 @@ Geometry Geom NRI - @VERSION@ + @SALOMEGEOM_VERSION@ Geometry component 1 ModuleGeom.png @@ -642,7 +642,7 @@ GEOM_Superv OTHER - @VERSION@ + @SALOMEGEOM_VERSION@ Supervision wrapper for Geometry component 1 1 diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index 6f5be593d..d61bbf8bf 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -27,7 +27,7 @@ - +