All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Руслан Ижбулатов" <lrn1986@gmail.com>
To: linux-media@vger.kernel.org
Subject: [PATCH 8/8] [PATCH for ZBar] Correctly generate version.xml and reldate.xml
Date: Tue,  9 Apr 2019 12:38:42 +0000	[thread overview]
Message-ID: <20190409123842.19600-9-lrn1986@gmail.com> (raw)
In-Reply-To: <20190409123842.19600-1-lrn1986@gmail.com>

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: Руслан Ижбулатов <lrn1986@gmail.com>
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3224888..41d77fd 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"]
 )
 
-- 
2.4.0


  parent reply	other threads:[~2019-04-09 12:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-09 12:38 [PATCH 0/8] [PATCH for ZBar] MinGW compatibility patches Руслан Ижбулатов
2019-04-09 12:38 ` [PATCH 1/8] [PATCH for ZBar] Include windows.h for vfw Руслан Ижбулатов
2019-04-09 12:38 ` [PATCH 2/8] [PATCH for ZBar] Specify correct path to barcode.png Руслан Ижбулатов
2019-04-09 12:38 ` [PATCH 3/8] [PATCH for ZBar] Check for clock_gettime on pthread library as well Руслан Ижбулатов
2019-04-09 12:38 ` [PATCH 4/8] [PATCH for ZBar] Disable zbarcam-gtk on Windows Руслан Ижбулатов
2019-04-09 12:38 ` [PATCH 5/8] [PATCH for ZBar] Use -no-undefined for libzbargtk Руслан Ижбулатов
2019-04-09 12:38 ` [PATCH 6/8] [PATCH for ZBar] Make zbargtk build on Windows Руслан Ижбулатов
2019-04-09 12:38 ` [PATCH 7/8] [PATCH for ZBar] Make use of glib thread names Руслан Ижбулатов
2019-04-09 12:38 ` Руслан Ижбулатов [this message]
2019-04-25 12:05 ` [PATCH 0/8] [PATCH for ZBar] MinGW compatibility patches Mauro Carvalho Chehab

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190409123842.19600-9-lrn1986@gmail.com \
    --to=lrn1986@gmail.com \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.