Merging with BR_Dev_For_4_0 - "Final adaptation of old make mechanizm for new automak...

diff --git a/build_configure b/build_configure
index be501f0cafe71e6cb53d8d39cce4700001444367..fcff55aa4d99f67a9cb4542abaed753addce709c 100755 (executable)
--- 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 9e90c365bc4721816c86620f93682f6f7f2d9fb3..1c8de10b3bf84a7640049b106f5524e8bf315cda 100644 (file)
--- 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