From bb0a5a125b4504e8b94fa89013a9344e0a7c2868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Tue, 9 Apr 2019 09:38:42 -0300 Subject: [PATCH] Correctly generate version.xml and reldate.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The buildsystem expects these files to be in srcdir, so put them there. Otherwise documentation won't build (xmlto complains that it can't find the files. Note that it uses an absolute path, so there's no way to solve this with its --searchpath argument). Signed-off-by: Руслан Ижбулатов --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 3224888f..41d77fd9 100644 --- a/configure.ac +++ b/configure.ac @@ -667,14 +667,14 @@ AC_CONFIG_COMMANDS([doc/version.xml], [AS_IF([test -f doc/version.xml && \ ! echo $VERSION | diff doc/version.xml - >/dev/null 2>&1 || \ ! echo $VERSION | diff $srcdir/doc/version.xml - >/dev/null 2>&1 ], - [echo "writing new doc/version.xml" ; echo $VERSION > doc/version.xml ])], + [echo "writing new doc/version.xml" ; echo $VERSION > $srcdir/doc/version.xml ])], [VERSION="$VERSION"] ) AC_CONFIG_COMMANDS([doc/reldate.xml], [AS_IF([test -f doc/reldate.xml && \ ! echo $RELDATE | diff doc/reldate.xml - >/dev/null 2>&1 || \ ! echo $RELDATE | diff $srcdir/doc/reldate.xml - >/dev/null 2>&1 ], - [echo "writing new doc/reldate.xml" ; echo $RELDATE > doc/reldate.xml ])], + [echo "writing new doc/reldate.xml" ; echo $RELDATE > $srcdir/doc/reldate.xml ])], [RELDATE="$RELDATE"] )