diff options
| author | Stephen Dolan <mu@netsoc.tcd.ie> | 2013-05-08 19:57:29 +0100 |
|---|---|---|
| committer | Stephen Dolan <mu@netsoc.tcd.ie> | 2013-05-08 19:57:29 +0100 |
| commit | 63b689bf5430ba82bede270999371795a90a5f39 (patch) | |
| tree | 6771ac6add98d74667b2a83e758be37b1d16177f | |
| parent | c710f91257a4fd02f51d0d4c0fa39b5db33437ec (diff) | |
Use the version number from configure.ac in the website.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | docs/site.yml | 5 |
4 files changed, 16 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 52e73379..58250496 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,10 @@ TEST_LOG_COMPILER = tests/run ### Packaging +docs/site.yml: configure.ac + sed 's/^jq_version: .*/jq_version: $(VERSION)/' $@ > $@.new + mv $@.new $@ + # setup is only used by distribution developers, not package developers. # Still, as a matter of allowing patching, its not a bad idea to distribute # the developer setup script in the tarball. diff --git a/Makefile.in b/Makefile.in index 5a8e9a9c..692cca20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -359,7 +359,7 @@ AM_CFLAGS = -Wextra -Wall -Wno-missing-field-initializers \ # While there is some autoconf macro support for lex/flex, it doesn't support # header file creation so we'll use good old make -BUILT_SOURCES = lexer.h lexer.c +BUILT_SOURCES = lexer.h lexer.c parser.h parser.c # Tell YACC (bison) autoconf macros that you want a header file created. # If the --warnings=all fails, you probably have an old version of bison @@ -373,8 +373,6 @@ jq_SOURCES = ${JQ_SRC} main.c TESTS = tests/all.test TEST_LOG_COMPILER = tests/run -### Packaging - # setup is only used by distribution developers, not package developers. # Still, as a matter of allowing patching, its not a bad idea to distribute # the developer setup script in the tarball. @@ -1099,6 +1097,12 @@ lexer.h: lexer.c main.c: config.h +### Packaging + +docs/site.yml: configure.ac + sed 's/^jq_version: .*/jq_version: $(VERSION)/' $@ > $@.new + mv $@.new $@ + jq.1 : cd ${abs_srcdir}/docs; rake manpage > ${abs_builddir}/$@ diff --git a/configure.ac b/configure.ac index c42425d9..5bbc0b55 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([jq], m4_esyscmd([tr -d '\n' <VERSION]), [mu@netsoc.tcd.ie], +AC_INIT([jq], [1.2], [mu@netsoc.tcd.ie], [jq], [http://stedolan.github.com/jq/]) dnl Created autoconf implementation thompson@dtosolutions, 26NOV12 diff --git a/docs/site.yml b/docs/site.yml index 863d578d..ae66854f 100644 --- a/docs/site.yml +++ b/docs/site.yml @@ -1,7 +1,10 @@ # The key value pairs found below are available within the templates. +# This line is modified by the Makefile. To change the version number, +# edit the Autoconf version number at the top of configure.ac jq_version: 1.2 + root: '/jq' footer: | @@ -11,4 +14,4 @@ footer: | jq is licensed under the MIT license (code) and the [CC-BY-3.0](http://creativecommons.org/licenses/by/3.0/) license - (docs).
\ No newline at end of file + (docs). |