- 2.6.23

[packages/libxml2.git] / libxml2-DESTDIR.patch

diff --git a/libxml2-DESTDIR.patch b/libxml2-DESTDIR.patch
index 3fb883cd5d97d2eaa538ce495b340516777e8b43..fc32e46e631b94d8c796798996a5be1732ce3538 100644 (file)
--- a/libxml2-DESTDIR.patch
+++ b/libxml2-DESTDIR.patch
@@ -1,29 +1,30 @@
---- libxml2-2.4.25/python/Makefile.am.orig     Fri Sep  6 04:35:41 2002
-+++ libxml2-2.4.25/python/Makefile.am  Sun Sep 29 01:07:18 2002
-@@ -22,7 +22,7 @@
+--- libxml2-2.6.4/python/Makefile.am.orig      2003-12-21 12:01:40.000000000 +0100
++++ libxml2-2.6.4/python/Makefile.am   2003-12-26 19:42:40.933314784 +0100
+@@ -23,7 +23,7 @@
        libxml2-python-api.xml  \
        $(DOCS)
  
--libxml2mod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/.libs
-+libxml2mod_la_LDFLAGS = -module -avoid-version
+-libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version -L$(top_builddir)/.libs
++libxml2mod_la_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ @WIN32_EXTRA_LDFLAGS@ -module -avoid-version 
  
  if WITH_PYTHON
  mylibs = \
 @@ -32,6 +32,7 @@
+ all-local:    libxml2.py
  
- pythondir = $(libdir)/python${PYTHON_VERSION}/site-packages
  python_LTLIBRARIES = libxml2mod.la
-+python_DATA = libxml2.py
++python_DATA = libxml2.py drv_libxml2.py
  
  libxml2mod_la_SOURCES = libxml.c types.c libxml2-py.c
  libxml2mod_la_LIBADD = $(mylibs)
-@@ -39,13 +40,6 @@
- libxml2.py: $(srcdir)/libxml.py libxml2class.py
-       cat $(srcdir)/libxml.py libxml2class.py > libxml2.py
+@@ -39,14 +40,6 @@
+ libxml2.py: $(srcdir)/libxml.py $(srcdir)/libxml2class.py
+       cat $(srcdir)/libxml.py $(srcdir)/libxml2class.py > libxml2.py
  
 -install-data-local:
--      $(mkinstalldirs) $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages
--      @INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(libdir)/python${PYTHON_VERSION}/site-packages
+-      $(mkinstalldirs) $(DESTDIR)$(pythondir)
+-      @INSTALL@ -m 0644 libxml2.py $(DESTDIR)$(pythondir)
+-      @INSTALL@ -m 0644 $(srcdir)/drv_libxml2.py $(DESTDIR)$(pythondir)
 -      $(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
 -      @(for doc in $(DOCS) ; \
 -         do @INSTALL@ -m 0644 $$doc $(DESTDIR)$(DOCS_DIR) ; done)