From: apo <apo@opencascade.com>
Date: Fri, 29 Jun 2007 11:48:40 +0000 (+0000)
Subject: Merging with BR_Dev_For_4_0 - "Final adaptation of old make mechanizm for new automak... 
X-Git-Tag: T_MULTIPR_INDUS_Dump_python~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=89d0852d6df30bb735480e0e81c9e4a766d8f009;p=modules%2Fmultipr.git

Merging with BR_Dev_For_4_0 - "Final adaptation of old make mechanizm for new automake building procedure of base modules"
---

diff --git a/build_configure b/build_configure
index be501f0..fcff55a 100755
--- a/build_configure
+++ b/build_configure
@@ -252,6 +252,7 @@ else
 fi
 
 aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
+				       -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED \
                                        -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
 				       -I ${MED_ROOT_DIR}/adm_local/unix/config_files
 if autoconf
diff --git a/configure.in.base b/configure.in.base
index 9e90c36..1c8de10 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -16,7 +16,7 @@
 #
 
 AC_INIT(src)
-AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files)
+AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/DEPRECATED)
 AC_CANONICAL_HOST
 
 PACKAGE=salome
@@ -88,7 +88,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='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh
+      INSTALL='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/DEPRECATED/install-sh
       ;;
 esac