* Makefile.in: Add rule to rebuild Makefile if Makefile.in changes.

	Include Makefile.dep last.
	(Makefile.dep): Run xidepend within source dir.  Temporarily drop
	faq.xml from dependencies.
	* xidepend: Fix creating base filename to accommodate VPATH.

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 438bdc003663dd52efd237a144e32ca9a01b7689..4ab28b256a7e4ef1ac38decf06085501c72d4813 100644 (file)
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-04  Corinna Vinschen  <corinna@vinschen.de>
+
+       * Makefile.in: Add rule to rebuild Makefile if Makefile.in changes.
+       Include Makefile.dep last.
+       (Makefile.dep): Run xidepend within source dir.  Temporarily drop
+       faq.xml from dependencies.
+       * xidepend: Fix creating base filename to accommodate VPATH.
+
 2013-06-04  Corinna Vinschen  <corinna@vinschen.de>
 
        * new-features.xml (ov-new1.7.19): Align mandatory locking text to

diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index 35b33fa403503ea88b31d1f7ee73e4fdbac96ee0..48bf50472802d479bb2789aabc32a0090311c7c2 100644 (file)
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -21,7 +21,6 @@ exeext:=@build_exeext@
 XMLTO:=xmlto --skip-validation --with-dblatex
 
 include $(srcdir)/../Makefile.common
--include $(srcdir)/Makefile.dep
 
 FAQ_SOURCES:= $(wildcard ${srcdir}/faq*.xml)
 
@@ -38,6 +37,9 @@ all: Makefile Makefile.dep \
        cygwin-ug-net/cygwin-ug-net.pdf \
        cygwin-api/cygwin-api.pdf
 
+Makefile: ${srcdir}/Makefile.in
+       /bin/sh ./config.status
+
 clean:
        rm -f Makefile.dep
        rm -f doctool.exe doctool.o
@@ -87,5 +89,9 @@ tarball : cygwin-docs.tar.bz2
 cygwin-docs.tar.bz2 : $(TBFILES) $(TBDEPS)
        find $(TBFILES) $(TBDIRS) \! -type d | sort | tar -T - -cf -  | bzip2 > cygwin-docs.tar.bz2
 
-Makefile.dep: cygwin-ug-net.xml faq.xml
-       $(srcdir)/xidepend $^ > $@
+Makefile.dep: cygwin-ug-net.xml
+       builddir=`pwd` \
+       && cd $(srcdir) \
+       && $(srcdir)/xidepend $^ > "$${builddir}/$@"
+
+-include Makefile.dep

diff --git a/winsup/doc/xidepend b/winsup/doc/xidepend
index 0704a7f28b4d94724c63b7a93a625f4003a500ea..2a1fc831ddeed6787e5a4b7112efbf0e3e8e1037 100755 (executable)
--- a/winsup/doc/xidepend
+++ b/winsup/doc/xidepend
@@ -14,7 +14,7 @@ do
        if fgrep -q 'xi:include' "$f"
        then
                # This file uses XIncludes.  Let's chase its deps recursively.
-               base=`echo $f | sed -e s/\.xml//`
+               base=`basename "$f" .xml`
                if [ $subproc -eq 0 ] ; then echo -n "$base/$base.html:" ; fi
 
                deps=`grep 'xi:include.*href' "$f" | cut -f2 -d\" | tr '\n' ' '`