Improve make procedure (add aclocal flags)

This commit is contained in:
vsr 2009-04-15 13:33:51 +00:00
parent a831b10813
commit ca6257883d
2 changed files with 11 additions and 2 deletions

View File

@ -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

View File

@ -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