Apply patch from Paul Rascle (correction of make procedure)

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index bb2834d43dfe4c805dcfb0f55306688cb7f0e62a..dc5c94ddd1dce4c7d90b9a687115175ff80a4cf5 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -10,12 +10,9 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LIBSFORBIN=@LIBS@
 LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
-LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
-LDFLAGSFORBIN+= -lstdc++
 
 CP=@CP@
 

diff --git a/configure.in.base b/configure.in.base
index 16b69067734b17eeffeb3f5f1c5339b0df91801c..32846d9e3773e64bef465ec1b6aa0e31d8e0ce4c 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -335,7 +335,7 @@ do
   case "$local_bin" in
         *.in | *~)                    ;;
         ./bin/CVS | ./bin/salome)                    ;;
-        *) /usr/bin/install -C $i .; echo $local_bin ;;
+        *) /usr/bin/install $i .; echo $local_bin ;;
   esac
 done
 cd $ROOT_BUILDDIR

diff --git a/src/GraphBase/Makefile.in b/src/GraphBase/Makefile.in
index 1b1c8a6495e112fe41620a2abadbf31da332176d..a1194956cbc045f5f8e59a6ebc700351a727600e 100644 (file)
--- a/src/GraphBase/Makefile.in
+++ b/src/GraphBase/Makefile.in
@@ -105,6 +105,7 @@ CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
 LDFLAGS= -L../../lib/salome $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace \
        -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(OGL_LIBS) \
        -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGSFORBIN=$(LDFLAGS) -lSalomeContainer -lSalomeResourcesManager -lRegistry -lSalomeNotification -lSALOMETraceCollector
 //LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 
 @CONCLUDE@