libxml2-amfix.patch

   1 diff -urN libxml2-2.5.10.orig/Makefile.am libxml2-2.5.10/Makefile.am
   2 --- libxml2-2.5.10.orig/Makefile.am     Fri Aug 15 15:03:34 2003
   3 +++ libxml2-2.5.10/Makefile.am  Fri Aug 15 15:06:34 2003
   4 @@ -5,7 +5,7 @@
   5
   6  DIST_SUBDIRS = include . doc example python
   7
   8 -INCLUDES = -I$(top_builddir)/include -I@srcdir@/include @THREAD_CFLAGS@ @Z_CFLAGS@
   9 +INCLUDES = -I$(top_builddir)/include -I$(srcdir)/include $(THREAD_CFLAGS) $(Z_CFLAGS)
  10
  11  noinst_PROGRAMS=testSchemas testRelax testSAX testHTML testXPath testURI \
  12                  testDocbook testThreads testC14N testAutomata testRegexp \
  13 @@ -16,9 +16,9 @@
  14  bin_SCRIPTS=xml2-config
  15
  16  lib_LTLIBRARIES = libxml2.la
  17 -libxml2_la_LIBADD = @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm
  18 +libxml2_la_LIBADD = $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm
  19
  20 -libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@
  21 +libxml2_la_LDFLAGS = -version-info $(LIBXML_VERSION_INFO)
  22
  23  if WITH_TRIO_SOURCES
  24  libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c  \
  25 @@ -39,7 +39,7 @@
  26  endif
  27
  28  DEPS = $(top_builddir)/libxml2.la
  29 -LDADDS = @STATIC_BINARIES@ $(top_builddir)/libxml2.la @THREAD_LIBS@ @Z_LIBS@ $(ICONV_LIBS) -lm @WIN32_EXTRA_LIBADD@
  30 +LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(ICONV_LIBS) -lm $(WIN32_EXTRA_LIBADD)
  31
  32
  33  man_MANS = xml2-config.1 libxml.3
  34 @@ -50,7 +50,7 @@
  35  xmllint_SOURCES=xmllint.c
  36  xmllint_LDFLAGS =
  37  xmllint_DEPENDENCIES = $(DEPS)
  38 -xmllint_LDADD=  @RDL_LIBS@ $(LDADDS)
  39 +xmllint_LDADD=  $(RDL_LIBS) libxml2.la
  40
  41  testSAX_SOURCES=testSAX.c
  42  testSAX_LDFLAGS =
  43 @@ -789,8 +789,6 @@
  44
  45  CLEANFILES=xml2Conf.sh
  46
  47 -confexecdir=$(libdir)
  48 -confexec_DATA = xml2Conf.sh
  49  EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
  50               libxml.m4 Copyright check-xml-test-suite.py \
  51              check-relaxng-test-suite.py check-xinclude-test-suite.py \
  52 diff -urN libxml2-2.5.10.orig/include/libxml/Makefile.am libxml2-2.5.10/include/libxml/Makefile.am
  53 --- libxml2-2.5.10.orig/include/libxml/Makefile.am      Fri Aug 15 15:03:34 2003
  54 +++ libxml2-2.5.10/include/libxml/Makefile.am   Fri Aug 15 15:04:18 2003
  55 @@ -41,7 +41,4 @@
  56                 xmlreader.h \
  57                 relaxng.h
  58
  59 -install-exec-hook:
  60 -       $(mkinstalldirs) $(DESTDIR)$(xmlincdir)
  61 -
  62  EXTRA_DIST = xmlversion.h.in