https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=2ef3009068568c542cc46ce11ef1477d3a9c826a

commit 2ef3009068568c542cc46ce11ef1477d3a9c826a
Author: Jon TURNEY <[email protected]>
Date:   Fri Jun 12 10:56:55 2015 +0100

    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  <[email protected]>
    
        * xidepend: Fix to handle relative pathnames.
    
    Signed-off-by: Jon TURNEY <[email protected]>

Diff:
---
 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  <[email protected]>
 
+       * xidepend: Fix to handle relative pathnames.
+
+2015-06-12  Jon Turney  <[email protected]>
+
        * Makefile.in (.PHONY): Remove tarball target.
 
 2015-06-04  Jon Turney  <[email protected]>
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.

Reply via email to