Join modifications from branch BR_3_1_0deb

[modules/superv.git] / build_configure

diff --git a/build_configure b/build_configure
index dd16d71ec6c3787ba4877966aa50f4fc868da8c6..734930e9e643872b3a2dcd6e2994dfbab4c60fac 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -55,6 +55,7 @@ find_in()
 
   case $1 in
     */CVS) return ;;
+    */adm_local/*) return ;;
     *) ;;
   esac
 
@@ -109,7 +110,7 @@ fi
 
 # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
 echo "" >> configure.in_tmp1
-echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1
@@ -134,7 +135,7 @@ echo "      ./salome_adm/unix/make_module \\" >> configure.in_tmp1
 touch configure.in_tmp2
 find_in . configure.in_tmp2
 sed -e '/^...salome_adm/d' configure.in_tmp2 >  configure.in_tmp3
-sed -e '/^...adm_local.unix.make_omniorb/d' configure.in_tmp3 configure.in_tmp2
+sed -e '/^...adm_local.unix.make_omniorb/d' configure.in_tmp3 > configure.in_tmp2
 sed -e '/^...adm_local.unix.make_commence/d' configure.in_tmp2 > configure.in_tmp3
 sed -e '/configure.in/d' configure.in_tmp3 >  configure.in_tmp2
 sed -e 's/.in / /' configure.in_tmp2 >>  configure.in_tmp1