From: Jon TURNEY <jon.turney@dronecode.org.uk>
To: cygwin-patches@cygwin.com
Cc: Jon TURNEY <jon.turney@dronecode.org.uk>
Subject: [PATCH 2/8] winsup/doc: Fix xidepend to handle relative pathnames
Date: Mon, 15 Jun 2015 12:37:00 -0000 [thread overview]
Message-ID: <1434371793-3980-3-git-send-email-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <1434371793-3980-1-git-send-email-jon.turney@dronecode.org.uk>
It seems that xidepend doesn't work correctly if we are ./configure'd using a
relative pathname to the srcdir:
$ make
cd ../../../../src/winsup/doc && ./xidepend ../../../../src/winsup/doc/cygwin-ug-net.xml ../../../../src/winsup/doc/cygwin-api.xml >"/wip/cygwin/build/x86_64-unknown-cygwin/winsup/doc/Makefile.dep"
grep: ../../../../src/winsup/doc/cygwin-ug-net.xml: No such file or directory
grep: ../../../../src/winsup/doc/cygwin-api.xml: No such file or directory
Although it might be better to fix this by making xidepend use pathnames, rather
than ignoring them and assuming everything is in the current directory...
2015-06-12 Jon Turney <jon.turney@dronecode.org.uk>
* xidepend: Fix to handle relative pathnames.
Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
---
winsup/doc/ChangeLog | 4 ++++
winsup/doc/xidepend | 1 +
2 files changed, 5 insertions(+)
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index aa45e3d..aac7b3d 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,5 +1,9 @@
2015-06-12 Jon Turney <jon.turney@dronecode.org.uk>
+ * xidepend: Fix to handle relative pathnames.
+
+2015-06-12 Jon Turney <jon.turney@dronecode.org.uk>
+
* Makefile.in (.PHONY): Remove tarball target.
2015-06-04 Jon Turney <jon.turney@dronecode.org.uk>
diff --git a/winsup/doc/xidepend b/winsup/doc/xidepend
index d3b233a..f476620 100755
--- a/winsup/doc/xidepend
+++ b/winsup/doc/xidepend
@@ -11,6 +11,7 @@ fi
for f in "$@"
do
+ f=`basename "$f"`
if fgrep -q 'xi:include' "$f"
then
# This file uses XIncludes. Let's chase its deps recursively.
--
2.1.4
next prev parent reply other threads:[~2015-06-15 12:37 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-15 12:36 [PATCH 0/8] Generate utilities manpages Jon TURNEY
2015-06-15 12:37 ` [PATCH 7/8] winsup/doc: Make and install manpages for utils Jon TURNEY
2015-06-15 18:12 ` Corinna Vinschen
2015-06-15 12:37 ` [PATCH 5/8] winsup/doc: Convert utils.xml to using refentry Jon TURNEY
2015-06-15 17:11 ` Corinna Vinschen
2015-06-16 9:28 ` Jon TURNEY
2015-06-16 9:45 ` Corinna Vinschen
2015-06-16 11:09 ` Jon TURNEY
2015-06-16 12:49 ` Corinna Vinschen
2015-06-16 17:33 ` Jon TURNEY
2015-06-16 17:49 ` Corinna Vinschen
2015-06-16 18:50 ` Jon TURNEY
2015-06-16 19:17 ` Corinna Vinschen
2015-06-15 12:37 ` [PATCH 3/8] winsup/doc: Some preparatory XML fixes Jon TURNEY
2015-06-15 17:04 ` Corinna Vinschen
2015-06-16 9:22 ` Jon TURNEY
2015-06-16 9:35 ` Corinna Vinschen
2015-06-15 12:37 ` [PATCH 6/8] winsup/doc: Make it easier to extend xidepend to more targets Jon TURNEY
2015-06-15 17:15 ` Corinna Vinschen
2015-06-15 12:37 ` Jon TURNEY [this message]
2015-06-15 17:02 ` [PATCH 2/8] winsup/doc: Fix xidepend to handle relative pathnames Corinna Vinschen
2015-06-15 12:37 ` [PATCH 1/8] winsup/doc: Remove tarball target from .PHONY Jon TURNEY
2015-06-15 16:52 ` Corinna Vinschen
2015-06-15 12:37 ` [PATCH 8/8] winsup/doc: Fix an issue with parallel make Jon TURNEY
2015-06-15 17:16 ` Corinna Vinschen
2015-06-15 12:37 ` [PATCH 4/8] winsup/doc: Use fo.xsl to customize PDF generation from DocBook XML Jon TURNEY
2015-06-15 17:05 ` Corinna Vinschen
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=1434371793-3980-3-git-send-email-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-patches@cygwin.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).