lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-10-21 14:53:44 +03:00
Code Activity

moved includes to includedir/libxml2/libxml, updated the configuration

Browse Source 
* config.h.in configure.in libxml.spec.in include/libxml/Makefile.am
  libxml-2.0.pc.in: moved includes to includedir/libxml2/libxml,
  updated the configuration scripts systems accordingly
This commit is contained in:
Daniel Veillard
2001-09-12 20:19:58 +00:00
parent 04382ae3d6
commit 07cdb2a84f
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
Wed Sep 12 22:14:55 CEST 2001 Daniel Veillard <daniel@veillard.com>
* config.h.in configure.in libxml.spec.in include/libxml/Makefile.am
libxml-2.0.pc.in: moved includes to includedir/libxml2/libxml,
updated the configuration scripts systems accordingly
Wed Sep 12 20:49:32 CEST 2001 Daniel Veillard <daniel@veillard.com> Wed Sep 12 20:49:32 CEST 2001 Daniel Veillard <daniel@veillard.com>
* configure.in: preparing for 2.4.4 * configure.in: preparing for 2.4.4

3
config.h.in
View File

@@ -91,9 +91,6 @@
/* Define if you have the <dirent.h> header file. */ /* Define if you have the <dirent.h> header file. */
#undef HAVE_DIRENT_H #undef HAVE_DIRENT_H
/* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
/* Define if you have the <errno.h> header file. */ /* Define if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H #undef HAVE_ERRNO_H

2
configure.in
View File

@@ -143,7 +143,7 @@ AC_CHECK_FUNC(isinf, AC_DEFINE(HAVE_ISINF) , AC_CHECK_LIB(m, isinf,
[AC_DEFINE(HAVE_ISINF)])) [AC_DEFINE(HAVE_ISINF)]))
XML_LIBDIR='-L${libdir}' XML_LIBDIR='-L${libdir}'
XML_INCLUDEDIR='-I${includedir}/libxml -I${includedir}' XML_INCLUDEDIR='-I${includedir}/libxml2/libxml -I${includedir}/libxml2'
dnl dnl
dnl Extra flags dnl Extra flags

4
include/libxml/Makefile.am
View File

@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
xmlincdir = $(includedir)/libxml xmlincdir = $(includedir)/libxml2/libxml
xmlinc_HEADERS = \ xmlinc_HEADERS = \
SAX.h \ SAX.h \
@@ -32,6 +32,6 @@ xmlinc_HEADERS = \
catalog.h catalog.h
install-exec-hook: install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml $(mkinstalldirs) $(DESTDIR)$(xmlincdir)/libxml2 $(DESTDIR)$(xmlincdir)/libxml2/libxml
EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in EXTRA_DIST = xmlversion.h.in xmlwin32version.h.in

4
libxml-2.0.pc.in
View File

@@ -6,7 +6,7 @@ includedir=@includedir@
Name: libXML Name: libXML
Version: @VERSION@ Version: @VERSION@
Description: libXML library. Description: libXML library version2.
Requires: Requires:
Libs: -L${libdir} -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@ Libs: -L${libdir} -lxml2 @Z_LIBS@ @M_LIBS@ @LIBS@
Cflags: @XML_INCLUDEDIR@ @XML_CFLAGS@ Cflags: -I${includedir}/libxml2/libxml @XML_CFLAGS@

7
libxml.spec.in
View File

@@ -117,8 +117,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO %doc AUTHORS ChangeLog NEWS README COPYING COPYING.LIB TODO
%doc /usr/share/man/man1/xmllint.1* %doc %{prefix}/share/man/man1/xmllint.1*
%doc /usr/share/man/man4/libxml.4* %doc %{prefix}/share/man/man4/libxml.4*
%{prefix}/lib/lib*.so.* %{prefix}/lib/lib*.so.*
%{prefix}/bin/xmllint %{prefix}/bin/xmllint
@@ -136,5 +136,4 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/include/* %{prefix}/include/*
%{prefix}/bin/xml2-config %{prefix}/bin/xml2-config
%{prefix}/share/aclocal/libxml.m4 %{prefix}/share/aclocal/libxml.m4
# I'm not certain if this should be included in the distribution or not. %{prefix}/lib/pkgconfig/libxml-2.0.pc
#%{prefix}/lib/pkgconfig/libxml-2.0.pc