PR: to allow GUI compilation

diff --git a/configure.ac b/configure.ac
index daf82ade032063ec243e4993f480b7725c8011e1..62eb706838d09b4ac6f214a84ac27e910cf579f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -227,11 +227,11 @@ DEFAULT_ORB=omniORB
 echo DEFAULT_ORB : $DEFAULT_ORB
 CHECK_CORBA
 
-CORBA_RULES=salome_adm/unix/make_$ORB
-AC_SUBST_FILE(CORBA_RULES)
+CORBA=salome_adm/unix/make_$ORB
+AC_SUBST_FILE(CORBA)
 
 # _CS_gbo:
-# The CORBA_RULES variable defines the file name that
+# The CORBA variable defines the file name that
 # implements the building rules to be included by Makefile to process
 # idl files and CORBA specific dependencies (ex: the file
 # salome_adm/unix/make_omniorb is the default for SALOME). The value

diff --git a/salome_adm/unix/Makefile.am b/salome_adm/unix/Makefile.am
index 45dec69e5d444d1605b8af4e8b285b8ba60dd17a..836b487eedf1beab1e4dfc750f4055606d88fbb6 100644 (file)
--- a/salome_adm/unix/Makefile.am
+++ b/salome_adm/unix/Makefile.am
@@ -15,4 +15,5 @@ salomeadmux_DATA=\
        make_conclude.in \
        make_module.in \
        make_omniorb.in \
+       pythonbe.py \
        $(DEPRECATED_FILES)

diff --git a/salome_adm/unix/make_conclude.in b/salome_adm/unix/make_conclude.in
index ee4ec67a1b1c2e52b0ba2144f2b16b7b96717da7..adce12a218eee82c3850d4de3c44911977a9ac82 100644 (file)
--- a/salome_adm/unix/make_conclude.in
+++ b/salome_adm/unix/make_conclude.in
@@ -11,7 +11,7 @@
 #
 
 # ORB Specifics rules
-@CORBA_RULES@
+@CORBA@
 
 # transform idl reference in appropriate obj file
 LIB_CLIENT_SRC = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX))