summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2015-06-12 10:56:55 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2015-06-16 10:13:29 +0100
commit2ef3009068568c542cc46ce11ef1477d3a9c826a (patch)
treecb5fa092f0782e32aed24ad5576b001419fe080e
parentefc0b0094ba0bfeb0dea0b20be42d4089bc90fae (diff)
downloadcygnal-2ef3009068568c542cc46ce11ef1477d3a9c826a.tar.gz
cygnal-2ef3009068568c542cc46ce11ef1477d3a9c826a.tar.bz2
cygnal-2ef3009068568c542cc46ce11ef1477d3a9c826a.zip
winsup/doc: Fix xidepend to handle relative pathnames
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>
-rw-r--r--winsup/doc/ChangeLog4
-rwxr-xr-xwinsup/doc/xidepend1
2 files changed, 5 insertions, 0 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index aa45e3d8c..aac7b3dcf 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 d3b233a57..f4766209e 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.