do not install outside of prefix, make sure the API get shipped. Daniel

* configure.in doc/Makefile.am: do not install outside of prefix,
  make sure the API get shipped.
Daniel

diff --git a/ChangeLog b/ChangeLog
index 3e19e65..c73a058 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb  5 17:35:00 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+       * configure.in doc/Makefile.am: do not install outside of prefix,
+         make sure the API get shipped.
+
 Mon Feb  4 19:47:32 CET 2002 Daniel Veillard <daniel@veillard.com>
 
        * libxslt/pattern.[ch] doc/libxslt-api.xml doc/libxslt-refs.xml:

diff --git a/configure.in b/configure.in
index 7f296ec..ed5f954 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -150,8 +150,16 @@ if test "$with_python" != "no" ; then
     then
         PYTHON_VERSION=`$PYTHON -c "import sys; print sys.version[[0:3]]"`
        echo Found Python version $PYTHON_VERSION
+       LIBXML2_PYTHON=`python -c "try : import libxml2 ; print 1
+except: print 0"`
+       if test "$LIBXML2_PYTHON" == "1"
+       then
+           echo Found libxml2-python module
+       else
+           echo Missing libxml2-python
+       fi
     fi
-    if test "$PYTHON_VERSION" != ""
+    if test "$PYTHON_VERSION" != "" -a "$LIBXML2_PYTHON" == "1"
     then
        if test -r $with_python/include/python$PYTHON_VERSION/Python.h -a \
           -d $with_python/lib/python$PYTHON_VERSION/site-packages
@@ -167,7 +175,7 @@ if test "$with_python" != "no" ; then
                if test -r /usr/include/python$PYTHON_VERSION/Python.h
                then
                    PYTHON_INCLUDES=/usr/include/python$PYTHON_VERSION
-                   PYTHON_SITE_PACKAGES=/usr/lib/python$PYTHON_VERSION/site-packages
+                   PYTHON_SITE_PACKAGES='$(prefix)/lib/python$(PYTHON_VERSION)/site-packages'
                else
                    echo could not find python$PYTHON_VERSION/Python.h
                fi

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1705eb0..70f8699 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,6 @@
 ## Process this file with automake to produce Makefile.in
+EXTRA_DIST =                   \
+       libxslt-api.xml
 
 # The name of the module.
 DOC_MODULE=libxslt-$(VERSION)

diff --git a/doc/libxslt-api.xml b/doc/libxslt-api.xml
index 88fcb49..8e47d76 100644 (file)
--- a/doc/libxslt-api.xml
+++ b/doc/libxslt-api.xml
@@ -1081,8 +1081,8 @@
       <arg name='ctxt' type='xsltTransformContextPtr'/>
       <arg name='node' type='xmlNodePtr' info='a node in the source tree '/>
       <arg name='pattern' type='const xmlChar *' info='an XSLT pattern '/>
-      <arg name='ctxtdoc' type='xmlDocPtr'/>
-      <arg name='ctxtnode' type='xmlNodePtr'/>
+      <arg name='ctxtdoc' type='xmlDocPtr' info='context document (for namespaces) '/>
+      <arg name='ctxtnode' type='xmlNodePtr' info='context node (for namespaces) '/>
     </function>
     <function name='xsltMessage' file='xsltutils'>
       <info>Process and xsl:message construct</info>

diff --git a/doc/libxslt-refs.xml b/doc/libxslt-refs.xml
index 8335ddd..520a3e3 100644 (file)
--- a/doc/libxslt-refs.xml
+++ b/doc/libxslt-refs.xml
@@ -3156,6 +3156,7 @@
           <ref name='xsltCopyNamespaceList'/>
           <ref name='xsltEvalXPathPredicate'/>
           <ref name='xsltFreeNamespaceAliasHashes'/>
+          <ref name='xsltMatchPattern'/>
         </word>
         <word name='need'>
           <ref name='xsltEvalGlobalVariables'/>

diff --git a/python/Makefile.am b/python/Makefile.am
index bf0d6ff..71355b0 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -26,6 +26,14 @@ libxslt.py: $(srcdir)/libxsl.py libxsltclass.py
 
 _libxslt.so: libxslt.o libxslt-py.o types.o
        $(CC) $(LINK_FLAGS) libxslt.o libxslt-py.o types.o $(LIBS) -o _libxslt.so
+
+install-data-local:
+       $(mkinstalldirs) $(DESTDIR)$(PYTHON_SITE_PACKAGES)
+       -@INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(PYTHON_SITE_PACKAGES)
+       -@INSTALL@ -m 0755 _libxslt.so $(DESTDIR)$(PYTHON_SITE_PACKAGES)
+       $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
+       -@(for doc in $(DOCS) ; \
+          do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)
 else
 all: 
 endif
@@ -55,11 +63,4 @@ tests: all
 clean:
        rm -f $(GENERATED) *.o _libxslt.so *.pyc libxslt.py
 
-install-data-local:
-       $(mkinstalldirs) $(DESTDIR)$(PYTHON_SITE_PACKAGES)
-       -@INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(PYTHON_SITE_PACKAGES)
-       -@INSTALL@ -m 0755 _libxslt.so $(DESTDIR)$(PYTHON_SITE_PACKAGES)
-       $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
-       -@(for doc in $(DOCS) ; \
-          do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)