NRI : Merge from V1_2.

diff --git a/bin/VERSION b/bin/VERSION
index cdeb8b33bb9b0263d7a5cfb7ac587f5f15eb3603..b52f804d04bc7b52f63c6c4e4d06c040f3955ee7 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME PRO - KERNEL VERSION: 1.1a
+THIS IS SALOME PRO - KERNEL VERSION: 1.2

diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 1ea6feac7065c75d4f68ecc516c1dbb99ef2a91f..7d216e70cd6146c952d3c810599decd9d1087c65 100755 (executable)
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME PRO v.1.1a"
-PROJECT_NUMBER         = id#1.0
+PROJECT_NAME           = "SALOME PRO v.1.2"
+PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English
 EXTRACT_ALL            = YES

diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 6b636a242121ce8b4e90d2391361c730eb6ea185..f7fe30037246235cc2cf895a29aa0838753f8ec8 100644 (file)
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -1,10 +1,12 @@
-# -* Makefile *- 
+#  Copyright (C) 2003  CEA/DEN, EDF R&D
 #
-# Author : Vasily Rusyaev (Open Cascade NN)
-# Date : 13/02/2003
-# $Header: 
 #
-# source path
+#
+#  File   : Makefile.in
+#  Author : Vasily Rusyaev (Open Cascade NN)
+#  Module : doc
+#  $Header: 
+
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@

diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in
index c9dbea0538f81d4617ce648db0231a949f0af67b..d5e8ecc61b1b598e057539a99fb75a52809fb5c3 100644 (file)
--- a/salome_adm/unix/make_commence.in
+++ b/salome_adm/unix/make_commence.in
@@ -194,7 +194,7 @@ idldir=${prefix}/idl/salome
 sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
 incmakedir=${prefix}/salome_adm/unix
 
-docdir=@exec_prefix@/doc
+docdir=$(datadir)/doc
 
 #
 # begin of package rules

diff --git a/src/Utils/Utils_Timer.hxx b/src/Utils/Utils_Timer.hxx
index a35afb6ad95e2ffda23dfdf7f95da2c5159385b5..06e10671bf589b5650dcceabb8706702c8400576 100644 (file)
--- a/src/Utils/Utils_Timer.hxx
+++ b/src/Utils/Utils_Timer.hxx
@@ -24,6 +24,9 @@
 //  File   : Utils_Timer.hxx
 //  Module : SALOME
 
+#include <stdlib.h>
+#include <time.h>
+
 # include <sys/times.h>
 # include <sys/time.h>
 # include <unistd.h>