python-psycopg-lib64.patch

   1 diff -dur psycopg-1.1.11.orig/aclocal.m4 psycopg-1.1.11/aclocal.m4
   2 --- psycopg-1.1.11.orig/aclocal.m4      2003-12-18 23:08:23.000000000 +0100
   3 +++ psycopg-1.1.11/aclocal.m4   2004-02-18 11:17:39.919319805 +0100
   4 @@ -107,7 +107,7 @@
   5  AC_REQUIRE([PY_PYTHON_EXEC_PREFIX])
   6  AC_MSG_CHECKING(definitions in Python library makefile)
   7  AC_CACHE_VAL(py_cv_python_makefile_vars,
   8 -[py_makefile="${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/config/Makefile"
   9 +[py_makefile="${PYTHON_EXEC_PREFIX}/lib64/python${PYTHON_VERSION}/config/Makefile"
  10  dnl set defaults for these variables so they work with Python 1.4
  11  py_cv_python_makefile_LINKCC=''
  12  py_cv_python_makefile_SGI_ABI=''
  13 @@ -192,8 +192,8 @@
  14  AC_DEFUN(PY_CHECK_INSTALL,
  15  [AC_REQUIRE([PY_PYTHON_VERSION])
  16  AC_REQUIRE([PY_PYTHON_EXEC_PREFIX])
  17 -if test -x "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/install-sh"; then
  18 -  INSTALL="$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/install-sh"
  19 +if test -x "$PYTHON_EXEC_PREFIX/lib64/python$PYTHON_VERSION/config/install-sh"; then
  20 +  INSTALL="$PYTHON_EXEC_PREFIX/lib64/python$PYTHON_VERSION/config/install-sh"
  21    AC_SUBST(INSTALL)
  22  else
  23    AC_PATH_PROG(INSTALL, install, install)
  24 @@ -212,8 +212,8 @@
  25  sp = list(())
  26  for p in sys.path:
  27    sp.append(os.path.normpath(p))
  28 -for dir in ('/lib/site-python', '/lib/python${PYTHON_VERSION}/site-packages',
  29 -      '/lib/python${PYTHON_VERSION}'):
  30 +for dir in ('/lib64/site-python', '/lib64/python${PYTHON_VERSION}/site-packages',
  31 +      '/lib64/python${PYTHON_VERSION}'):
  32    p = os.path.normpath(sys.prefix+dir)
  33    if os.path.isdir(p) and p in sp:
  34      print dir
  35 @@ -233,11 +233,11 @@
  36  AC_CACHE_VAL(py_cv_python_module_dir, dnl
  37  [py_cv_python_module_dir=`$PYTHON -c "
  38  import sys, os
  39 -for dir in ('/lib/python${PYTHON_VERSION}/site-packages',
  40 -            '/lib/python${PYTHON_VERSION}/lib-dynload',
  41 -            '/lib/python${PYTHON_VERSION}/sharedmodules',
  42 -            '/lib/site-python',
  43 -            '/lib/python${PYTHON_VERSION}'):
  44 +for dir in ('/lib64/python${PYTHON_VERSION}/site-packages',
  45 +            '/lib64/python${PYTHON_VERSION}/lib-dynload',
  46 +            '/lib64/python${PYTHON_VERSION}/sharedmodules',
  47 +            '/lib64/site-python',
  48 +            '/lib64/python${PYTHON_VERSION}'):
  49    if os.path.isdir(sys.exec_prefix+dir) and (sys.exec_prefix+dir) in sys.path:
  50      print dir
  51      break"`])
  52 @@ -256,7 +256,7 @@
  53  AC_OUTPUT($2 $3 $1.pre,dnl
  54  [echo creating $1
  55  $MAKESETUP -m $1.pre -c - $2],dnl
  56 -[MAKESETUP="${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/config/makesetup"
  57 +[MAKESETUP="${PYTHON_EXEC_PREFIX}/lib64/python${PYTHON_VERSION}/config/makesetup"
  58  ])
  59  ])
  60
  61 Only in psycopg-1.1.11: aclocal.m4~