diff --git a/Makefile.am b/Makefile.am index d7215b51e..6e47ea3ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,10 +3,4 @@ AUTOMAKE_OPTIONS=foreign EXTRA_DIST= LICENSE.txt README.md -# Temporary for work on https://github.com/johnkerl/miller/issues/9: -# In Travis build: -# $ a2x -d manpage -f manpage miller.1.txt -# a2x: ERROR: "xmllint" --nonet --noout --valid "/path/to/pub_http_internet/miller/doc/miller.1.xml" returned non-zero exit status 4 - -# SUBDIRS=c doc -SUBDIRS=c +SUBDIRS=c doc diff --git a/c/mlrvers.h b/c/mlrvers.h index 36f7a7fc4..c73a0a09e 100644 --- a/c/mlrvers.h +++ b/c/mlrvers.h @@ -1,5 +1,5 @@ #ifndef MLRVERS_H #define MLRVERS_H // Manually increment on updates to https://github.com/johnkerl/miller/releases -#define MLR_VERSION "v2.2.0" +#define MLR_VERSION "v2.2.1" #endif // MLRVERS_H diff --git a/configure.ac b/configure.ac index 984996703..e5dad2dbf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) # Manually increment on updates to https://github.com/johnkerl/miller/releases -AC_INIT([mlr],[2.2.0]) +AC_INIT([mlr],[2.2.1]) AC_CONFIG_SRCDIR([c/mlrmain.c]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([autotools]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 3a091dc21..3f613dc96 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,11 @@ EXTRA_DIST= miller.1.txt miller.1 man1_MANS= miller.1 -MAINTAINERCLEANFILES= miller.1 +# Temporary for work on https://github.com/johnkerl/miller/issues/9: +# In Travis build: +# $ a2x -d manpage -f manpage miller.1.txt +# a2x: ERROR: "xmllint" --nonet --noout --valid "/path/to/pub_http_internet/miller/doc/miller.1.xml" returned non-zero exit status 4 +MAINTAINERCLEANFILES= miller.1 miller.1: miller.1.txt - a2x -d manpage -f manpage miller.1.txt + cp miller.1.premade miller.1