Improve make procedure (add aclocal flags)

diff --git a/Makefile.am b/Makefile.am
index 34a6eae32ed99140fc61df16a112bf0c577f5fb3..ace7bd22e3b7f9b76a6422b0f9aef43671d1a2ef 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,15 @@
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if GEOM_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+else !GEOM_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+endif
+
 SUBDIRS = idl adm_local resources src doc bin
 
 DIST_SUBDIRS = idl adm_local resources src doc bin 

diff --git a/build_configure b/build_configure
index d8b893183c39712872cca0ea3d54f6b8f900f682..cc474f8a090e1d79158797a3089f22d4830a648c 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -104,8 +104,8 @@ echo "====================================================== aclocal"
 
 if test ${GEOM_WITH_GUI} = yes; then
   aclocal -I adm_local/unix/config_files \
-          -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-          -I ${GUI_ROOT_DIR}/adm_local/unix/config_files || exit 1
+          -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
+          -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1
 else
   aclocal -I adm_local/unix/config_files \
           -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files || exit 1