diff options
| author | Aron Xu <aron@debian.org> | 2012-06-14 21:36:43 +0800 |
|---|---|---|
| committer | Aron Xu <aron@debian.org> | 2012-06-14 21:36:43 +0800 |
| commit | b375e565d45af59b26a36ce2995a0719c0c5c998 (patch) | |
| tree | 1279cdd62c70d52b46033443aa07070d66707a88 | |
| parent | 2468b44c3a29734b3b156b5996a6a5c226347bbb (diff) | |
| download | libxml2-b375e565d45af59b26a36ce2995a0719c0c5c998.tar.gz | |
Try to make xml2-config output the same.
| -rw-r--r-- | debian/patches/0001-restore-generated-html.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0002-modify-xml2-config-and-pkgconfig-behaviour.patch | 32 |
2 files changed, 19 insertions, 17 deletions
diff --git a/debian/patches/0001-restore-generated-html.patch b/debian/patches/0001-restore-generated-html.patch index 91166eb..369ae6d 100644 --- a/debian/patches/0001-restore-generated-html.patch +++ b/debian/patches/0001-restore-generated-html.patch @@ -1,10 +1,10 @@ From: Aron Xu <aron@debian.org> Date: Sun, 27 May 2012 19:47:19 +0800 -Subject: [PATCH] restore generated html +Subject: restore generated html --- doc/examples/index.html | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + 1 file changed, 14 insertions(+) create mode 100644 doc/examples/index.html diff --git a/doc/examples/index.html b/doc/examples/index.html diff --git a/debian/patches/0002-modify-xml2-config-and-pkgconfig-behaviour.patch b/debian/patches/0002-modify-xml2-config-and-pkgconfig-behaviour.patch index 265b2e4..dbb0cd6 100644 --- a/debian/patches/0002-modify-xml2-config-and-pkgconfig-behaviour.patch +++ b/debian/patches/0002-modify-xml2-config-and-pkgconfig-behaviour.patch @@ -1,13 +1,13 @@ From: Aron Xu <aron@debian.org> Date: Sun, 3 Jun 2012 17:54:56 +0800 -Subject: [PATCH] modify xml2-config and pkgconfig behaviour +Subject: modify xml2-config and pkgconfig behaviour --- configure.in | 2 +- libxml-2.0-uninstalled.pc.in | 3 ++- xml2-config.1 | 3 ++- - xml2-config.in | 14 +++++++++++--- - 4 files changed, 16 insertions(+), 6 deletions(-) + xml2-config.in | 20 +++++++++----------- + 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in index 0fb4983..e0fec4c 100644 @@ -53,7 +53,7 @@ index 8a25962..bfda630 100644 .B \-\-libs Print the linker flags that are necessary to link a \fIGNOME-XML\fP program. diff --git a/xml2-config.in b/xml2-config.in -index 2989325..a33c3eb 100644 +index 2989325..b97663a 100644 --- a/xml2-config.in +++ b/xml2-config.in @@ -15,6 +15,8 @@ Known values for OPTION are: @@ -65,20 +65,22 @@ index 2989325..a33c3eb 100644 --cflags print pre-processor and compiler flags --modules module support enabled --help display this help and exit -@@ -86,13 +88,19 @@ while test $# -gt 0; do - then - if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] - then +@@ -82,17 +84,13 @@ while test $# -gt 0; do + ;; + + --libs) +- if [ "`uname`" = "Linux" ] +- then +- if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ] +- then - echo @XML_LIBS@ -+ LIBS="@XML_LIBS@" - else +- else - echo @XML_LIBDIR@ @XML_LIBS@ -+ LIBS="@XML_LIBDIR@ @XML_LIBS@" - fi - else +- fi +- else - echo @XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@ -+ LIBS="@XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@" - fi +- fi ++ LIBS="@XML_LIBDIR@ @XML_LIBS@ @WIN32_EXTRA_LIBADD@" + if [ "$2" = "--static" ] + then + shift |