Addinng @LIB_LOCATION_SUFFIX@

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index e0a24f9c1dbd6e4c2db2cae0ec1a8d0aceed0e76..91a90d9f20f03a908d6267a1c94ebe1cb930b4e3 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -12,7 +12,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 
@@ -175,7 +175,7 @@ SALOME_INCLUDES = \
 CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS)
 CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES)
 
-LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib/salome -L${SMESH_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome -lSalomeGenericObj
+LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${SMESH_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${GEOM_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lSalomeGenericObj
 
 # add corba libs when link salome application ! 
 #LDFLAGS+= $(CORBA_LIBS)
@@ -205,7 +205,7 @@ LN_S=@LN_S@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 bindir=@bindir@/salome
-libdir=@libdir@/salome
+libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome
 # warning : if user give this path in configure we could have salome/salome :-(
 includedir=@includedir@/salome
 datadir=@datadir@/salome

diff --git a/configure.in.base b/configure.in.base
index 4bf07964299beb3fe2954cf1d829965abf146043..41fd35715bb47883e1869abd39ceacaf84542145 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -360,7 +360,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 980cd860087f2bec08eaf9ca5c696403dae8888c..db81b82c48cb7272c68b6484fbb69a487e5201c4 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -46,7 +46,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
 # python wrap
 lib: pyidl
 
-PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
+PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
 
 pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)
 

diff --git a/src/GUI/Makefile.in b/src/GUI/Makefile.in
index d12da020909f349c6424a1fc2c9af47bab5a9ad2..46742c7ec5eff4afbb51097b53d6c46ab911680b 100644 (file)
--- a/src/GUI/Makefile.in
+++ b/src/GUI/Makefile.in
@@ -67,8 +67,6 @@ CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \
 CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \
            -I${GEOM_ROOT_DIR}/include/salome  -I${SMESH_ROOT_DIR}/include/salome
 
-LDFLAGS += -lSMESH $(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome \
-          -L${GUI_ROOT_DIR}/lib/salome -L${GEOM_ROOT_DIR}/lib/salome \
-          -L${SMESH_ROOT_DIR}/lib/salome
+LDFLAGS += $(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) ${GEOM_LDFLAGS} ${SMESH_LDFLAGS}
 
 @CONCLUDE@

diff --git a/src/NETGENPlugin/Makefile.in b/src/NETGENPlugin/Makefile.in
index 5e6bcf30399583a5a20107c03dd6a2a3809b61cc..920838dd3019e9ea19f1e4038903ec0f737aaf41 100644 (file)
--- a/src/NETGENPlugin/Makefile.in
+++ b/src/NETGENPlugin/Makefile.in
@@ -64,6 +64,6 @@ LIB = libNETGENEngine.la
 NETGEN_INCLUDES = @NETGEN_INCLUDES@
 CPPFLAGS += $(NETGEN_INCLUDES)
 CXXFLAGS += $(NETGEN_INCLUDES)
-LDFLAGS  += -lNETGEN
+LDFLAGS  +=  -L${NETGENPLUGIN_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lNETGEN
 
 @CONCLUDE@