mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-11 06:10:06 +02:00
114 lines
3.8 KiB
Plaintext
114 lines
3.8 KiB
Plaintext
From 52a5d213a7c464b51c0259f855811ecda990e3c6 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
|
Date: Wed, 1 Jan 2014 22:13:22 +0100
|
|
Subject: Port patches from libxml2-2.8.0.
|
|
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index a4a9f87..40c06ee 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -1221,8 +1221,8 @@ pkgconfig_DATA = libxml-2.0.pc
|
|
#
|
|
# Install the tests program sources as examples
|
|
#
|
|
-BASE_DIR=$(datadir)/doc
|
|
-DOC_MODULE=libxml2-$(VERSION)
|
|
+BASE_DIR=$(docdir)
|
|
+DOC_MODULE=
|
|
EXAMPLES_DIR=$(BASE_DIR)/$(DOC_MODULE)/examples
|
|
|
|
install-data-local:
|
|
diff --git a/configure.in b/configure.in
|
|
index d449b11..8db6662 100644
|
|
--- a/configure.in
|
|
+++ b/configure.in
|
|
@@ -784,23 +784,23 @@ if test "$with_python" != "no" ; then
|
|
fi
|
|
if test "$PYTHON_VERSION" != "" -a "$PYTHON_INCLUDES" = ""
|
|
then
|
|
- if test -r $with_python/include/python$PYTHON_VERSION/Python.h
|
|
+ if test -r $with_python/develop/headers/python$PYTHON_VERSION/Python.h
|
|
then
|
|
- PYTHON_INCLUDES=$with_python/include/python$PYTHON_VERSION
|
|
+ PYTHON_INCLUDES=$with_python/develop/headers/python$PYTHON_VERSION
|
|
else
|
|
- if test -r $prefix/include/python$PYTHON_VERSION/Python.h
|
|
+ if test -r $prefix/develop/headers/python$PYTHON_VERSION/Python.h
|
|
then
|
|
- PYTHON_INCLUDES=$prefix/include/python$PYTHON_VERSION
|
|
+ PYTHON_INCLUDES=$prefix/develop/headers/python$PYTHON_VERSION
|
|
else
|
|
- if test -r /usr/include/python$PYTHON_VERSION/Python.h
|
|
+ if test -r /usr/develop/headers/python$PYTHON_VERSION/Python.h
|
|
then
|
|
- PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
|
|
+ PYTHON_INCLUDES=/usr/develop/headers/python$PYTHON_VERSION
|
|
else
|
|
- if test -r $with_python/include/Python.h
|
|
+ if test -r $with_python/develop/headers/Python.h
|
|
then
|
|
- PYTHON_INCLUDES=$with_python/include
|
|
+ PYTHON_INCLUDES=$with_python/develop/headers
|
|
else
|
|
- echo could not find python$PYTHON_VERSION/Python.h or $with_python/include/Python.h
|
|
+ echo could not find python$PYTHON_VERSION/Python.h or $with_python/develop/headers/Python.h
|
|
fi
|
|
fi
|
|
fi
|
|
@@ -808,13 +808,13 @@ if test "$with_python" != "no" ; then
|
|
fi
|
|
if test "$PYTHON_VERSION" != "" -a "$PYTHON_SITE_PACKAGES" = ""
|
|
then
|
|
- if test -d $libdir/python$PYTHON_VERSION/site-packages
|
|
+ if test -d $libdir/python$PYTHON_VERSION/vendor-packages
|
|
then
|
|
- PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/site-packages
|
|
+ PYTHON_SITE_PACKAGES=$libdir/python$PYTHON_VERSION/vendor-packages
|
|
else
|
|
- if test -d $with_python/lib/site-packages
|
|
+ if test -d $with_python/lib/vendor-packages
|
|
then
|
|
- PYTHON_SITE_PACKAGES=$with_python/lib/site-packages
|
|
+ PYTHON_SITE_PACKAGES=$with_python/lib/vendor-packages
|
|
else
|
|
PYTHON_SITE_PACKAGES=`$PYTHON -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"`
|
|
fi
|
|
diff --git a/python/tests/Makefile.am b/python/tests/Makefile.am
|
|
index 95ebead..64d9a4e 100644
|
|
--- a/python/tests/Makefile.am
|
|
+++ b/python/tests/Makefile.am
|
|
@@ -1,4 +1,4 @@
|
|
-exampledir = $(datadir)/doc/libxml2-python-$(LIBXML_VERSION)/examples
|
|
+exampledir = $(docdir)_python-$(LIBXML_VERSION)/examples
|
|
dist_example_DATA = $(PYTESTS) $(XMLS)
|
|
|
|
PYTESTS= \
|
|
diff --git a/xml2-config.in b/xml2-config.in
|
|
index 1957486..9c98a0e 100644
|
|
--- a/xml2-config.in
|
|
+++ b/xml2-config.in
|
|
@@ -40,8 +40,8 @@ while test $# -gt 0; do
|
|
case "$1" in
|
|
--prefix=*)
|
|
prefix=$optarg
|
|
- includedir=$prefix/include
|
|
- libdir=$prefix/lib
|
|
+ includedir=$prefix/develop/headers
|
|
+ libdir=$prefix/develop/lib
|
|
;;
|
|
|
|
--prefix)
|
|
@@ -50,7 +50,7 @@ while test $# -gt 0; do
|
|
|
|
--exec-prefix=*)
|
|
exec_prefix=$optarg
|
|
- libdir=$exec_prefix/lib
|
|
+ libdir=$exec_prefix/develop/lib
|
|
;;
|
|
|
|
--exec-prefix)
|
|
--
|
|
1.8.3.4
|
|
|