summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2015-06-12 14:18:07 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2015-06-16 10:29:28 +0100
commit07605dccd2281e2daac08785a829553c60c0e1a8 (patch)
treec71bf6de703cf7a4047b7b72259b3f9770d93432
parent38529ea03a86161acef137bb74be276c5c7fcf8c (diff)
downloadcygnal-07605dccd2281e2daac08785a829553c60c0e1a8.tar.gz
cygnal-07605dccd2281e2daac08785a829553c60c0e1a8.tar.bz2
cygnal-07605dccd2281e2daac08785a829553c60c0e1a8.zip
winsup/doc: Fix an issue with parallel make
The cygwin-ug-net-nochunks.html.gz target does not ensure that the cygwin-ug-net/ directory exists, so it can fail if run on it's own, or if the cygwin-ug-net/cygwin-ug-net.html target has not yet created it in a parallel make. 2015-06-12 Jon Turney <jon.turney@dronecode.org.uk> * Makefile.in (cygwin-ug-net/cygwin-ug-net-nochunks.html.gz): Ensure cygwin-ug-net directory exists. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
-rw-r--r--winsup/doc/ChangeLog5
-rw-r--r--winsup/doc/Makefile.in1
2 files changed, 6 insertions, 0 deletions
diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 937cb39c7..60182a082 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,5 +1,10 @@
2015-06-12 Jon Turney <jon.turney@dronecode.org.uk>
+ * Makefile.in (cygwin-ug-net/cygwin-ug-net-nochunks.html.gz):
+ Ensure cygwin-ug-net directory exists.
+
+2015-06-12 Jon Turney <jon.turney@dronecode.org.uk>
+
* xidepend: Write a Makefile fragment defining variables
containing all the XIncluded sources, rather than a dependency on
those sources.
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index 14a8f22c7..856554b4e 100644
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -73,6 +73,7 @@ install-html: cygwin-ug-net/cygwin-ug-net.html cygwin-api/cygwin-api.html
cygwin-ug-net/cygwin-ug-net-nochunks.html.gz : $(cygwin-ug-net_SOURCES) cygwin.xsl
-$(XMLTO) html-nochunks -m $(srcdir)/cygwin.xsl $<
+ -@$(MKDIRP) cygwin-ug-net
-cp cygwin-ug-net.html cygwin-ug-net/cygwin-ug-net-nochunks.html
-rm -f cygwin-ug-net/cygwin-ug-net-nochunks.html.gz
-gzip cygwin-ug-net/cygwin-ug-net-nochunks.html