--- src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/ac_linker_options.m4.orig	2010-02-12 22:03:54.463021181 -0200
+++ src5.1.3/KERNEL_SRC_5.1.3/salome_adm/unix/config_files/ac_linker_options.m4	2010-02-12 22:14:54.002018028 -0200
@@ -25,7 +25,11 @@
 AC_DEFUN([AC_LINKER_OPTIONS],[
 
   AC_CHECKING(for LIB_LOCATION_SUFFIX)
-  LIB_LOCATION_SUFFIX=""
+  if uname -m | grep 64; then
+    LIB_LOCATION_SUFFIX="64"
+  else
+    LIB_LOCATION_SUFFIX=""
+  fi
   AC_SUBST(LIB_LOCATION_SUFFIX)
   AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
 
--- src5.1.3/GHS3DPRLPLUGIN_SRC_5.1.3/configure.ac.orig	2010-02-23 21:26:39.371598431 -0300
+++ src5.1.3/GHS3DPRLPLUGIN_SRC_5.1.3/configure.ac	2010-02-23 21:26:41.425596261 -0300
@@ -92,6 +92,9 @@
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
+# Testing linker
+AC_LINKER_OPTIONS
+
 dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
--- src5.1.3/NETGENPLUGIN_SRC_5.1.3/configure.ac.orig	2010-02-24 16:11:03.754886693 -0300
+++ src5.1.3/NETGENPLUGIN_SRC_5.1.3/configure.ac	2010-02-24 16:11:17.431883790 -0300
@@ -98,6 +98,9 @@
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 
+# Testing linker
+AC_LINKER_OPTIONS
+
 dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
--- src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4.orig	2010-02-26 17:36:09.644643555 -0300
+++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_linker_options.m4	2010-02-26 17:36:23.477638863 -0300
@@ -22,7 +22,11 @@
 AC_DEFUN([AC_LINKER_OPTIONS],[
 
   AC_CHECKING(for LIB_LOCATION_SUFFIX)
-  LIB_LOCATION_SUFFIX=""
+  if uname -m | grep 64; then
+    LIB_LOCATION_SUFFIX="64"
+  else
+    LIB_LOCATION_SUFFIX=""
+  fi
   AC_SUBST(LIB_LOCATION_SUFFIX)
   AC_MSG_RESULT(LIB_LOCATION_SUFFIX is $LIB_LOCATION_SUFFIX)
 
--- src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4.orig	2010-02-26 17:47:17.265639349 -0300
+++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/ac_python_devel.m4	2010-02-26 17:48:18.066638998 -0300
@@ -48,7 +48,7 @@
 	# Check for Python library path
 	AC_MSG_CHECKING([for Python library path])
 	python_path=`echo $PYTHON | sed "s,/bin.*$,,"`
-	for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
+	for i in "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/config/" "$python_path/lib$LIB_LOCATION_SUFFIX/python$PYTHON_VERSION/" "$python_path/lib$LIB_LOCATION_SUFFIX/python/config/" "$python_path/lib/python/" ; do
 		python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
 		if test -n "$python_path" ; then
 			break
--- src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/check_salome.m4.orig	2010-03-01 16:58:14.405486129 -0300
+++ src5.1.3/YACS_SRC_5.1.3/adm/unix/config_files/check_salome.m4	2010-03-01 16:58:34.236483528 -0300
@@ -78,7 +78,7 @@
       AC_MSG_WARN("Cannot find DSC Ports module distribution")
    fi
 
-   KERNEL_LDFLAGS=-L${KERNEL_ROOT_DIR}/lib/salome
+   KERNEL_LDFLAGS=-L${KERNEL_ROOT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
    KERNEL_CXXFLAGS=-I${KERNEL_ROOT_DIR}/include/salome
 
    AC_SUBST(KERNEL_ROOT_DIR)
--- src5.1.3/YACS_SRC_5.1.3/src/genericgui/Makefile.am.orig	2010-03-01 18:31:54.481484611 -0300
+++ src5.1.3/YACS_SRC_5.1.3/src/genericgui/Makefile.am	2010-03-01 18:32:14.376003757 -0300
@@ -16,7 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-libdir             = $(prefix)/lib/salome
+libdir             = $(prefix)/lib$(LIB_LOCATION_SUFFIX)/salome
 bindir             = $(prefix)/bin/salome
 
 lib_LTLIBRARIES = libGenericGui.la
--- src5.1.3/YACS_SRC_5.1.3/adm/unix/make_begin.am.orig	2010-03-01 18:35:34.664485314 -0300
+++ src5.1.3/YACS_SRC_5.1.3/adm/unix/make_begin.am	2010-03-01 18:35:45.214540109 -0300
@@ -22,7 +22,7 @@
 
 # Standard directory for installation
 salomeincludedir   = $(includedir)/salome
-libdir             = $(prefix)/lib/salome
+libdir             = $(prefix)/lib$(LIB_LOCATION_SUFFIX)/salome
 bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)
 salomepythondir    = $(pythondir)/salome