From: rahuel <rahuel@opencascade.com>
Date: Wed, 14 Jun 2006 16:03:20 +0000 (+0000)
Subject: lib64 on 64 bits machines
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3150ad6849b90578f521e96f9dea92f6edcadaa8;p=modules%2Fkernel.git

lib64 on 64 bits machines
---

diff --git a/salome_adm/unix/config_files/python.m4 b/salome_adm/unix/config_files/python.m4
index 0f3e0cf84..7736bf7f3 100644
--- a/salome_adm/unix/config_files/python.m4
+++ b/salome_adm/unix/config_files/python.m4
@@ -62,7 +62,7 @@ AC_DEFUN([CHECK_PYTHON],
   changequote([, ])dnl
   AC_SUBST(PYTHON_VERSION)
 
-  PY_MAKEFILE=${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python$PYTHON_VERSION/config/Makefile
+  PY_MAKEFILE=${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/config/Makefile
   if test ! -f "$PY_MAKEFILE"; then
      AC_MSG_WARN([*** Couldn't find ${PY_MAKEFILE}.  Maybe you are
 *** missing the development portion of the python installation])
@@ -73,9 +73,9 @@ AC_DEFUN([CHECK_PYTHON],
   AC_SUBST(PYTHON_LIBS)
 
   PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION
-  PYTHON_LIBS="-L${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python${PYTHON_VERSION}/config -lpython${PYTHON_VERSION}"
+  PYTHON_LIBS="-L${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/config -lpython${PYTHON_VERSION}"
   PYTHON_LIB=$PYTHON_LIBS
-  PYTHON_LIBA=${PYTHON_PREFIX}/lib${LIB_LOCATION_SUFFIX}/python$PYTHON_VERSION/config/libpython$PYTHON_VERSION.a
+  PYTHON_LIBA=${PYTHON_PREFIX}/lib/python$PYTHON_VERSION/config/libpython$PYTHON_VERSION.a
 
   dnl At times (like when building shared libraries) you may want
   dnl to know which OS Python thinks this is.
@@ -97,7 +97,7 @@ dnl python_site_given=no]
 
    [PYTHON_SITE="$withval"
     python_site_given=yes],
-   [PYTHON_SITE=${prefix}"/lib${LIB_LOCATION_SUFFIX}/python"${PYTHON_VERSION}/site-packages
+   [PYTHON_SITE=${prefix}"/lib/python"${PYTHON_VERSION}/site-packages
     python_site_given=no])
 
   AC_SUBST(PYTHON_SITE_PACKAGE)
@@ -115,7 +115,7 @@ dnl python_site_given=no]
     [if test "$python_site_given" = yes; then
        PYTHON_SITE_EXEC=$PYTHON_SITE
      else
-       PYTHON_SITE_EXEC=${PYTHON_EXEC_PREFIX}"/lib${LIB_LOCATION_SUFFIX}/python"${PYTHON_VERSION}/site-packages
+       PYTHON_SITE_EXEC=${PYTHON_EXEC_PREFIX}"/lib/python"${PYTHON_VERSION}/site-packages
      fi])
 
   dnl Set up the install directory
@@ -126,7 +126,7 @@ dnl python_site_given=no]
 
   dnl Also lets automake think PYTHON means something.
 
-  pythondir=${PYTHON_PREFIX}"/lib${LIB_LOCATION_SUFFIX}/python"${PYTHON_VERSION}/
+  pythondir=${PYTHON_PREFIX}"/lib/python"${PYTHON_VERSION}/
   AC_SUBST(pythondir)
 
  AC_MSG_CHECKING([if we need libdb])