NRI : Merge from V1_2.

diff --git a/build_configure b/build_configure
index 0cf5fc380ad1cb9c6ef1809fefdc8e7d658e694f..1c6c322b47fb53103a19996930766fc7caa5d7d2 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -89,11 +89,6 @@ then
 fi
 chmod u-w configure.in.base 
 
-#############################################
-echo '' >> configure.in_tmp1
-echo 'export TEMPO=${KERNEL_ROOT_DIR}' >> configure.in_tmp1
-echo 'export KERNEL_ROOT_DIR=${ROOT_SRCDIR}' >> configure.in_tmp1
-#############################################
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1
@@ -104,30 +99,24 @@ echo "AC_OUTPUT([ \\" >> configure.in_tmp1
 # put them "manually"
 #
 
-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/make_omniorb \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/make_commence \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1
-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1
-echo "  ./salome_adm/Makefile \\" >> configure.in_tmp1
+echo " ./adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
+echo " ./adm/unix/F77config.h \\" >> configure.in_tmp1
+echo " ./adm/unix/sstream \\" >> configure.in_tmp1
+echo " ./adm/unix/depend \\" >> configure.in_tmp1
+echo " ./adm/unix/make_omniorb \\" >> configure.in_tmp1
+echo " ./adm/unix/envScript \\" >> configure.in_tmp1
+echo " ./adm/unix/make_commence \\" >> configure.in_tmp1
+echo " ./adm/unix/make_conclude \\" >> configure.in_tmp1
+echo " ./adm/unix/make_module \\" >> configure.in_tmp1
 
 \rm -f configure.in_tmp2 configure.in_tmp3
 touch configure.in_tmp2
 find_in . configure.in_tmp2
-sed '/^...salome_adm/d' configure.in_tmp2 >  configure.in_tmp3
+sed '/^...adm/d' configure.in_tmp2 >  configure.in_tmp3
 sed '/configure.in/d' configure.in_tmp3 >  configure.in_tmp2
 sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1
 
 echo  "])" >> configure.in_tmp1
-
-#############################################
-echo 'export KERNEL_ROOT_DIR=${TEMPO}' >> configure.in_tmp1
-#############################################
-
 \mv configure.in_tmp1 configure.in_new
 \rm  -f configure.in_tmp2 configure.in_tmp3