Commit 8e199906 authored by Daniel Veillard's avatar Daniel Veillard
Browse files

Some packaging cleanup:

- Makefile.am doc/Makefile.am libxml.spec.in: painful work to get
  the HTML doc to go into the -devel RPM ...
- aclocal.m4 config.h.in: some updates due to auto* magic
Daniel
parent 93086663
Thu Jan 25 19:22:25 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* Makefile.am doc/Makefile.am libxml.spec.in: painful work to get
the HTML doc to go into the -devel RPM ...
* aclocal.m4 config.h.in: some updates due to auto* magic
Thu Jan 25 19:11:49 CET 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
* xpath.h: added a hook in the context structure allowing to
......
......@@ -386,7 +386,10 @@ dist-hook: libxml.spec
-cp libxml.spec $(distdir)
(cd $(srcdir) ; tar -cf - --exclude CVS test result SAXresult ) | (cd $(distdir); tar xf -)
rpm: $(distdir).tar.gz
cleantar:
@(rm -f libxslt*.tar.gz)
rpm: cleantar distcheck
rpm -ta $(distdir).tar.gz
## We create xmlConf.sh here and not from configure because we want
......
......@@ -620,35 +620,31 @@ esac
])
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl convenience library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-convenience to the
# configure arguments. Note that LIBLTDL and INCLTDL are not
# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not
# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed
# with '${top_builddir}/' and INCLTDL will be prefixed with
# '${top_srcdir}/' (note the single quotes!). If your package is not
# flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles.
# the libltdl convenience library, adds --enable-ltdl-convenience to
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
# '${top_builddir}/' (note the single quotes!) if your package is not
# flat, and, if you're not using automake, define top_builddir as
# appropriate in the Makefiles.
AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case "$enable_ltdl_convenience" in
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
"") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
# the libltdl installable library and INCLTDL to the include flags for
# the libltdl header and adds --enable-ltdl-install to the configure
# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is
# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed
# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will
# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed
# with '${top_srcdir}/' (note the single quotes!). If your package is
# not flat and you're not using automake, define top_builddir and
# top_srcdir appropriately in the Makefiles.
# the libltdl installable library, and adds --enable-ltdl-install to
# the configure arguments. Note that LIBLTDL is not AC_SUBSTed, nor
# is AC_CONFIG_SUBDIRS called. If DIR is not provided, it is assumed
# to be `${top_builddir}/libltdl'. Make sure you start DIR with
# '${top_builddir}/' (note the single quotes!) if your package is not
# flat, and, if you're not using automake, define top_builddir as
# appropriate in the Makefiles.
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_CHECK_LIB(ltdl, main,
......@@ -661,8 +657,8 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
])
if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
......
......@@ -16,6 +16,9 @@
#undef HAVE_LIBREADLINE
#undef SOCKLEN_T
/* Define if you have the _stat function. */
#undef HAVE__STAT
/* Define if you have the class function. */
#undef HAVE_CLASS
......@@ -40,6 +43,9 @@
/* Define if you have the snprintf function. */
#undef HAVE_SNPRINTF
/* Define if you have the stat function. */
#undef HAVE_STAT
/* Define if you have the strdup function. */
#undef HAVE_STRDUP
......
## Process this file with automake to produce Makefile.in
# The name of the module.
DOC_MODULE=gnome-xml
DOC_MODULE=libxml2-$(VERSION)
# The top-level SGML file.
DOC_MAIN_SGML_FILE=gnome-xml.sgml
......@@ -9,9 +9,9 @@ DOC_MAIN_SGML_FILE=gnome-xml.sgml
# The directory containing the source code (if it contains documentation).
DOC_SOURCE_DIR=..
HTML_DIR=$(datadir)/gnome-xml/html
HTML_DIR=$(prefix)/doc
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)/html
# htmldir = $(prefix)/html
# html_DATA = gnome-dev-info.html
......
......@@ -112,6 +112,7 @@ rm -rf $RPM_BUILD_ROOT
%doc /usr/man/man1/xmllint.1*
%doc /usr/man/man1/xml-config.1*
%doc /usr/man/man4/libxml.4*
%doc doc/*.html doc/html
%{prefix}/lib/lib*.so.*
%{prefix}/bin/xmllint
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment