Fix make install issues (Issue #257)

Bump version to 3.1.
pull/262/head
Michael R Sweet 5 years ago
parent c7755b6992
commit 75da0dcf21
  1. 6
      CHANGES.md
  2. 21
      Makefile.in
  3. 80
      configure
  4. 3
      configure.ac
  5. 4
      doc/body.md
  6. 2
      doc/mxml.3
  7. BIN
      doc/mxml.epub
  8. 6
      doc/mxml.html
  9. 2
      vcnet/config.h
  10. 2
      xcode/config.h

@ -1,3 +1,9 @@
# Changes in Mini-XML 3.1
- Fixed an issue with "make install" trying to install old files (Issue #257)
- Fixed some DSO installation issues on Linux.
# Changes in Mini-XML 3.0
- Changed the license to Apache 2.0 with exceptions (Issue #239)

@ -75,7 +75,8 @@ INSTALL_SCRIPT = $(INSTALL) -m 755
# Targets...
#
DOCFILES = doc/mxml.html doc/mxmldoc.xsd README.md COPYING CHANGES.md
DOCFILES = doc/mxml.epub doc/mxml.html doc/mxml-cover.png \
CHANGES.md LICENSE NOTICE README.md
PUBLIBOBJS = mxml-attr.o mxml-entity.o mxml-file.o mxml-get.o \
mxml-index.o mxml-node.o mxml-search.o mxml-set.o
LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o
@ -119,20 +120,6 @@ distclean: clean
$(RM) -r clang
#
# Run the clang.llvm.org static code analysis tool on the C sources.
#
.PHONY: clang clang-changes
clang:
echo Doing static code analysis of all code using CLANG...
$(RM) -r clang
scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) clean all
clang-changes:
echo Doing static code analysis of changed code using CLANG...
scan-build -V -k -o `pwd`/clang $(MAKE) $(MFLAGS) all
#
# Install everything...
#
@ -167,6 +154,7 @@ install-libmxml.so.1.6: libmxml.so.1.6
$(LN) libmxml.so.1.6 $(BUILDROOT)$(libdir)/libmxml.so
$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
$(LN) libmxml.so.1.6 $(BUILDROOT)$(libdir)/libmxml.so.1
$(LDCONFIG)
install-libmxml.1.dylib: libmxml.1.dylib
echo Installing libmxml.dylib to $(BUILDROOT)$(libdir)...
@ -198,7 +186,8 @@ uninstall-libmxml.so.1.6:
echo Uninstalling libmxml.so from $(BUILDROOT)$(libdir)...
$(RM) $(BUILDROOT)$(libdir)/libmxml.so
$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1
$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1.4
$(RM) $(BUILDROOT)$(libdir)/libmxml.so.1.6
$(LDCONFIG)
uninstall-libmxml.1.dylib:
echo Uninstalling libmxml.dylib from $(BUILDROOT)$(libdir)...

80
configure vendored

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Mini-XML 3.0.
# Generated by GNU Autoconf 2.69 for Mini-XML 3.1.
#
# Report bugs to <https://github.com/michaelrsweet/mxml/issues>.
#
@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Mini-XML'
PACKAGE_TARNAME='mxml'
PACKAGE_VERSION='3.0'
PACKAGE_STRING='Mini-XML 3.0'
PACKAGE_VERSION='3.1'
PACKAGE_STRING='Mini-XML 3.1'
PACKAGE_BUGREPORT='https://github.com/michaelrsweet/mxml/issues'
PACKAGE_URL='https://michaelrsweet.github.io/mxml'
@ -639,6 +639,7 @@ ARFLAGS
RM
MKDIR
LN
LDCONFIG
CP
AR
RANLIB
@ -685,6 +686,7 @@ infodir
docdir
oldincludedir
includedir
runstatedir
localstatedir
sharedstatedir
sysconfdir
@ -766,6 +768,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@ -1018,6 +1021,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@ -1155,7 +1167,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@ -1268,7 +1280,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures Mini-XML 3.0 to adapt to many kinds of systems.
\`configure' configures Mini-XML 3.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1308,6 +1320,7 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@ -1333,7 +1346,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of Mini-XML 3.0:";;
short | recursive ) echo "Configuration of Mini-XML 3.1:";;
esac
cat <<\_ACEOF
@ -1433,7 +1446,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
Mini-XML configure 3.0
Mini-XML configure 3.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1840,7 +1853,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by Mini-XML $as_me 3.0, which was
It was created by Mini-XML $as_me 3.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2298,7 +2311,7 @@ host_os_version=`echo $host_os | sed -e '1,$s/^[^0-9.]*//g'`
ac_config_headers="$ac_config_headers config.h"
VERSION="3.0"
VERSION="3.1"
cat >>confdefs.h <<_ACEOF
#define MXML_VERSION "Mini-XML v$VERSION"
@ -3734,6 +3747,51 @@ $as_echo "no" >&6; }
fi
for ac_prog in ldconfig false
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_LDCONFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $LDCONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_LDCONFIG="$LDCONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_LDCONFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
;;
esac
fi
LDCONFIG=$ac_cv_path_LDCONFIG
if test -n "$LDCONFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LDCONFIG" >&5
$as_echo "$LDCONFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
test -n "$LDCONFIG" && break
done
# Extract the first word of "ln", so it can be a program name with args.
set dummy ln; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@ -5129,7 +5187,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by Mini-XML $as_me 3.0, which was
This file was extended by Mini-XML $as_me 3.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -5192,7 +5250,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
Mini-XML config.status 3.0
Mini-XML config.status 3.1
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"

@ -10,7 +10,7 @@ dnl information.
dnl
dnl Package name and version...
AC_INIT([Mini-XML], [3.0], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://michaelrsweet.github.io/mxml])
AC_INIT([Mini-XML], [3.1], [https://github.com/michaelrsweet/mxml/issues], [mxml], [https://michaelrsweet.github.io/mxml])
dnl This line is provided to ensure that you don't run the autoheader program
dnl against this project. Doing so is completely unsupported and WILL cause
@ -79,6 +79,7 @@ fi
AC_PROG_RANLIB
AC_CHECK_TOOL(AR,ar)
AC_PATH_PROG(CP,cp)
AC_PATH_PROGS(LDCONFIG,ldconfig false)
AC_PATH_PROG(LN,ln)
AC_PATH_PROG(MKDIR,mkdir)
AC_PATH_PROG(RM,rm)

@ -1,8 +1,8 @@
---
title: Mini-XML 3.0 API Reference
title: Mini-XML 3.1 API Reference
author: Michael R Sweet
copyright: Copyright © 2003-2019, All Rights Reserved.
version: 3.0
version: 3.1
...
# Introduction

@ -1,4 +1,4 @@
.TH mxml 3 "Mini-XML API" "2019-03-01" "Mini-XML API"
.TH mxml 3 "Mini-XML API" "2019-07-03" "Mini-XML API"
.SH NAME
mxml \- Mini-XML API
.SH INCLUDE FILE

Binary file not shown.

@ -1,12 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<title>Mini-XML 3.0 API Reference</title>
<title>Mini-XML 3.1 API Reference</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8">
<meta name="creator" content="codedoc v3.2">
<meta name="author" content="Michael R Sweet">
<meta name="copyright" content="Copyright &#xa9; 2003-2019, All Rights Reserved.">
<meta name="version" content="3.0">
<meta name="version" content="3.1">
<style type="text/css"><!--
body, p, h1, h2, h3, h4, h5, h6 {
font-family: sans-serif;
@ -160,7 +160,7 @@ h2.title, h3.title {
<body>
<div class="header">
<p><img src="mxml-cover.png" width="100%"></p>
<h1 class="title">Mini-XML 3.0 API Reference</h1>
<h1 class="title">Mini-XML 3.1 API Reference</h1>
<p>Michael R Sweet</p>
<p>Copyright &#xa9; 2003-2019, All Rights Reserved.</p>
</div>

@ -63,7 +63,7 @@
* Version number...
*/
#define MXML_VERSION "Mini-XML v3.0"
#define MXML_VERSION "Mini-XML v3.1"
/*

@ -24,7 +24,7 @@
* Version number...
*/
#define MXML_VERSION "Mini-XML v3.0"
#define MXML_VERSION "Mini-XML v3.1"
/*

Loading…
Cancel
Save