From c0096b6069473e8f5ad1c277566e49f1e1d68355 Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Tue, 4 Jun 2013 11:50:41 +0000
Subject: [PATCH] 	* 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.

---
 winsup/doc/ChangeLog   |  8 ++++++++
 winsup/doc/Makefile.in | 12 +++++++++---
 winsup/doc/xidepend    |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 438bdc003..4ab28b256 100644
--- 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 35b33fa40..48bf50472 100644
--- 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 0704a7f28..2a1fc831d 100755
--- 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' ' '`
-- 
2.43.5