From a1a9bfe3d01cc22540ee4759b0ea7af804c74ba0 Mon Sep 17 00:00:00 2001 From: dcq Date: Wed, 3 Dec 2003 09:30:08 +0000 Subject: [PATCH] DCQ : Merge main branch (V1_3_0) --- build_configure | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build_configure b/build_configure index 41d838aa3..f2614b741 100755 --- a/build_configure +++ b/build_configure @@ -55,6 +55,7 @@ find_in() case $1 in */CVS) return ;; + */adm_local/*) return ;; *) ;; esac @@ -133,9 +134,14 @@ echo " ./salome_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 '/configure.in/d' configure.in_tmp3 > configure.in_tmp2 -sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1 +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_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 +#sed '/^.salome_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 -- 2.39.2