From cf6325b206c91b2edd48e05368be9f3de46da91c Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Wed, 14 Aug 2002 16:56:52 +0000 Subject: [PATCH] AMD x86-64 induced changes from Frederic Crozat Daniel * configure.in python/Makefile.am: AMD x86-64 induced changes from Frederic Crozat Daniel --- ChangeLog | 5 +++++ configure.in | 8 ++++++-- python/Makefile.am | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e26e5f2..6f6b43e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 14 18:54:19 CEST 2002 Daniel Veillard + + * configure.in python/Makefile.am: AMD x86-64 induced changes from + Frederic Crozat + Wed Aug 14 13:35:04 CEST 2002 Daniel Veillard * libxslt/functions.c: recovering to the old (somewhat) broken diff --git a/configure.in b/configure.in index 9877961c..34b70638 100644 --- a/configure.in +++ b/configure.in @@ -169,16 +169,20 @@ except: print 0"` if test -r $prefix/include/python$PYTHON_VERSION/Python.h then PYTHON_INCLUDES='$(prefix)/include/python$(PYTHON_VERSION)' - PYTHON_SITE_PACKAGES='$(prefix)/lib/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' else if test -r /usr/include/python$PYTHON_VERSION/Python.h then PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION - PYTHON_SITE_PACKAGES='$(prefix)/lib/python$(PYTHON_VERSION)/site-packages' + PYTHON_SITE_PACKAGES='$(libdir)/python$(PYTHON_VERSION)/site-packages' else echo could not find python$PYTHON_VERSION/Python.h fi fi + if ! test -d "$PYTHON_SITE_PACKAGES" + then + PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib()"` + fi fi fi fi diff --git a/python/Makefile.am b/python/Makefile.am index afc8cd72..8e98ea35 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -32,7 +32,7 @@ mylibs = \ all-local: libxslt.py -pythondir = $(prefix)/lib/python${PYTHON_VERSION}/site-packages +pythondir = $(libdir)/python${PYTHON_VERSION}/site-packages python_LTLIBRARIES = libxsltmod.la libxsltmod_la_SOURCES = libxslt.c types.c libxslt-py.c