This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH 2/8] winsup/doc: Fix xidepend to handle relative pathnames
- From: Jon TURNEY <jon dot turney at dronecode dot org dot uk>
- To: cygwin-patches at cygwin dot com
- Cc: Jon TURNEY <jon dot turney at dronecode dot org dot uk>
- Date: Mon, 15 Jun 2015 13:36:27 +0100
- Subject: [PATCH 2/8] winsup/doc: Fix xidepend to handle relative pathnames
- Authentication-results: sourceware.org; auth=none
- References: <1434371793-3980-1-git-send-email-jon dot turney at dronecode dot org dot 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