diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-08-25 07:54:13 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-08-25 22:16:02 +0000 |
| commit | 7f05ae67d33c8c443798a8382a4f5fbbd3509068 (patch) | |
| tree | 7f2321e0e6eb55810c6767c6719399fab42de901 | |
| parent | a84937198ba1c0ea5313aebd6d9cecc23f298af3 (diff) | |
As long as NEWS is still part of the git tree: At least don't differ
because of different timezones.
Change-Id: I93809447db29c2cc5f848edb438ee16372b57453
Reviewed-on: https://code.wireshark.org/review/3824
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
| -rw-r--r-- | cmake/modules/FindASCIIDOC.cmake | 2 | ||||
| -rw-r--r-- | docbook/Makefile.am | 2 | ||||
| -rw-r--r-- | docbook/Makefile.nmake | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cmake/modules/FindASCIIDOC.cmake b/cmake/modules/FindASCIIDOC.cmake index 19cb0395a1..16fe730e02 100644 --- a/cmake/modules/FindASCIIDOC.cmake +++ b/cmake/modules/FindASCIIDOC.cmake @@ -90,7 +90,7 @@ MACRO( ASCIIDOC2TXT _output _asciidocsource _conf_files ) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT ${_output} - COMMAND ${A2X_EXECUTABLE} + COMMAND TZ=UTC ${A2X_EXECUTABLE} --format=text --destination-dir=${CMAKE_CURRENT_BINARY_DIR} --asciidoc-opts=${_conf_opts} diff --git a/docbook/Makefile.am b/docbook/Makefile.am index b88e05d589..68d586ca34 100644 --- a/docbook/Makefile.am +++ b/docbook/Makefile.am @@ -249,7 +249,7 @@ release-notes.html: $(RELEASE_NOTES_SOURCE) # create txt single page file (through HTML) release-notes.txt: $(RELEASE_NOTES_SOURCE) @ echo --- RELEASE NOTES - TXT --- - $(A2X) --format=text $(A2X_TEXT_OPTS) \ + TZ=UTC $(A2X) --format=text $(A2X_TEXT_OPTS) \ --xsltproc-opts "--stringparam generate.toc \"article nop\"" \ $(srcdir)/release-notes.asciidoc mv $(srcdir)/release-notes.text $@ diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index 7d2c76c70e..02b9a52785 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -266,6 +266,7 @@ release-notes.txt: $(RELEASE_NOTES_SOURCE) $(SH) << PATH=/usr/bin PYTHONHOME=/ + TZ=UTC $(A2X) -v --format=text $(A2X_TEXT_OPTS) \ --xsltproc-opts "--stringparam generate.toc \"article nop\"" \ release-notes.asciidoc |