From 260388949ccdeb644dfd7f6ef2d908f6d9650567 Mon Sep 17 00:00:00 2001 From: nri Date: Wed, 9 Jul 2003 17:11:53 +0000 Subject: [PATCH] NRI : Merge from V1_2. --- build_configure | 31 +++++++++++++++++++++---------- configure.in.base | 24 ++++++++++++++---------- 2 files changed, 35 insertions(+), 20 deletions(-) diff --git a/build_configure b/build_configure index 1c6c322b4..0cf5fc380 100755 --- a/build_configure +++ b/build_configure @@ -89,6 +89,11 @@ 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 @@ -99,24 +104,30 @@ echo "AC_OUTPUT([ \\" >> configure.in_tmp1 # put them "manually" # -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 +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 \rm -f configure.in_tmp2 configure.in_tmp3 touch configure.in_tmp2 find_in . configure.in_tmp2 -sed '/^...adm/d' configure.in_tmp2 > configure.in_tmp3 +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 + +############################################# +echo 'export KERNEL_ROOT_DIR=${TEMPO}' >> configure.in_tmp1 +############################################# + \mv configure.in_tmp1 configure.in_new \rm -f configure.in_tmp2 configure.in_tmp3 diff --git a/configure.in.base b/configure.in.base index 6d9d8bfe1..c76d5a728 100644 --- a/configure.in.base +++ b/configure.in.base @@ -15,8 +15,8 @@ # Created from configure.in.base # -AC_INIT(SALOME) -AC_CONFIG_AUX_DIR(adm/unix/config_files) +AC_INIT(src) +AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST PACKAGE=salome @@ -37,6 +37,10 @@ cd $ROOT_BUILDDIR AC_SUBST(ROOT_SRCDIR) AC_SUBST(ROOT_BUILDDIR) +dnl ########################################################## +AC_SUBST(KERNEL_ROOT_DIR) +dnl ########################################################## + echo echo Source root directory : $ROOT_SRCDIR @@ -82,7 +86,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the dnl full-path to the binary instead. case "$INSTALL" in *install-sh*) - INSTALL='\${top_srcdir}'/adm/unix/config_files/install-sh + INSTALL='\${top_srcdir}'/salome_adm/unix/config_files/install-sh ;; esac @@ -191,7 +195,7 @@ CHECK_CORBA AC_SUBST_FILE(CORBA) corba=make_$ORB -CORBA=adm/unix/$corba +CORBA=salome_adm/unix/$corba echo echo --------------------------------------------- @@ -294,12 +298,12 @@ echo dnl generals files which could be included in every makefile -AC_SUBST_FILE(COMMENCE) COMMENCE=adm/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm/unix/make_conclude -AC_SUBST_FILE(MODULE) MODULE=adm/unix/make_module +AC_SUBST_FILE(COMMENCE) COMMENCE=salome_adm/unix/make_commence +AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module dnl les dependences -AC_SUBST_FILE(DEPEND) DEPEND=adm/unix/depend +AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend dnl We don t need to say when we re entering directories if we re using dnl GNU make becuase make does it for us. @@ -310,7 +314,7 @@ else fi # make other build directories -for rep in adm bin include lib share/salome/resources share/salome/idl +for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl do # if test ! -d $rep ; then # eval mkdir $rep @@ -355,7 +359,7 @@ do done cd $ROOT_BUILDDIR -AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=adm/unix/envScript +AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript dnl copy xml files to the build tree (lib directory) dnl pourquoi ???? -- 2.39.2