a missing DESTDIR fix reference to build paths in python module fix the

* libxslt/Makefile.am: a missing DESTDIR
* python/Makefile.am: fix reference to build paths in python module
* libexslt/exsltconfig.h.in libxslt/xsltconfig.h.in: fix the header
  comments on version values, the 3 are patches from Peter
  Breitenlohner   and should fix #340995
Daniel

diff --git a/ChangeLog b/ChangeLog
index 0ff9233..97f6e4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Oct 11 21:37:27 CEST 2006 Daniel Veillard <daniel@veillard.com>
+
+       * libxslt/Makefile.am: a missing DESTDIR
+       * python/Makefile.am: fix reference to build paths in python module
+       * libexslt/exsltconfig.h.in libxslt/xsltconfig.h.in: fix the header
+         comments on version values, the 3 are patches from Peter
+         Breitenlohner   and should fix #340995
+
 Wed Oct 11 11:16:34 CEST 2006 Daniel Veillard <daniel@veillard.com>
 
        * libxslt/security.c: applied cleanup patch from Mikhail Zabaluev

diff --git a/libexslt/exsltconfig.h.in b/libexslt/exsltconfig.h.in
index a45e07b..b46ffc0 100644 (file)
--- a/libexslt/exsltconfig.h.in
+++ b/libexslt/exsltconfig.h.in
@@ -23,14 +23,14 @@ extern "C" {
 /**
  * LIBEXSLT_VERSION:
  *
- * the version number: 1.2.3 value is 1002003
+ * the version number: 1.2.3 value is 10203
  */
 #define LIBEXSLT_VERSION @LIBEXSLT_VERSION_NUMBER@
 
 /**
  * LIBEXSLT_VERSION_STRING:
  *
- * the version number string, 1.2.3 value is "1002003"
+ * the version number string, 1.2.3 value is "10203"
  */
 #define LIBEXSLT_VERSION_STRING "@LIBEXSLT_VERSION_NUMBER@"
 

diff --git a/libxslt/Makefile.am b/libxslt/Makefile.am
index fb9f95f..d5aff94 100644 (file)
--- a/libxslt/Makefile.am
+++ b/libxslt/Makefile.am
@@ -61,4 +61,4 @@ xsltproc: all
        @(cd ../xsltproc ; $(MAKE))
 
 install-exec-hook:
-       $(mkinstalldirs) "$(libdir)/libxslt-plugins"
+       $(mkinstalldirs) "$(DESTDIR)$(libdir)/libxslt-plugins"

diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in
index 5e5687e..bd35c08 100644 (file)
--- a/libxslt/xsltconfig.h.in
+++ b/libxslt/xsltconfig.h.in
@@ -25,14 +25,14 @@ extern "C" {
 /**
  * LIBXSLT_VERSION:
  *
- * the version number: 1.2.3 value is 1002003
+ * the version number: 1.2.3 value is 10203
  */
 #define LIBXSLT_VERSION @LIBXSLT_VERSION_NUMBER@
 
 /**
  * LIBXSLT_VERSION_STRING:
  *
- * the version number string, 1.2.3 value is "1002003"
+ * the version number string, 1.2.3 value is "10203"
  */
 #define LIBXSLT_VERSION_STRING "@LIBXSLT_VERSION_NUMBER@"
 

diff --git a/python/Makefile.am b/python/Makefile.am
index b13c430..de2f8e3 100644 (file)
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -24,8 +24,7 @@ EXTRA_DIST =                  \
        libxslt-python-api.xml  \
        $(DOCS)
 
-libxsltmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/libxslt/.libs \
-                        -L$(top_builddir)/libexslt/.libs
+libxsltmod_la_LDFLAGS = -module -avoid-version
 
 if WITH_PYTHON
 mylibs = \