MPV: merge from branch BR_GUI_AutoTools

diff --git a/configure.ac b/configure.ac
index ac2fb1c1393779997b0a9d8a9918bb4917f0ceb6..3bba06fa80dbeb045905817b2ad47b4176a8975a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 #
 #AC_PREREQ(2.59)
 #AC_INIT(src)
-AC_INIT([Salome2 Project], [3.2.4], [gboulant@CS], [salome])
+AC_INIT([Salome2 Project], [3.2.2], [gboulant@CS], [salome])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -18,8 +18,8 @@ AM_INIT_AUTOMAKE
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=4.0.0
-XVERSION=0x040000
+VERSION=3.2.2
+XVERSION=0x030202
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
@@ -494,7 +494,7 @@ AC_OUTPUT([ \
        ./salome_adm/Makefile \
        ./salome_adm/unix/Makefile \
        ./salome_adm/unix/config_files/Makefile \
-       ./Makefile \
+       Makefile \
        ./bin/Makefile \
        ./bin/VERSION \
        ./bin/runIDLparser \