Skip to content

Commit 3a7c3c0

Browse files
committed
Cygwin: doc: Explictly name the output when building .info files
This works around a bug in docbook2x-texi seen with bash 5.3 while cross-building from Fedora 42. If the --output-dir option to db2x_texixml isn't specified (always the case when invoked by docbook2x-texi), then the script attempts cd '' which is now an error ("cd: null directory") rather than being treated as equivalent to cd '.' Instead, explicitly name the output file when building .info files.
1 parent 9dc06b7 commit 3a7c3c0

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

winsup/doc/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ XMLTO_HTML_CHUNK_QUIET=$(XMLTO_HTML_CHUNK_QUIET_$(V))
2424
XMLTO_MAN_QUIET_=--stringparam man.output.quietly=1
2525
XMLTO_MAN_QUIET=$(XMLTO_MAN_QUIET_$(V))
2626

27-
DOCBOOK2XTEXI=@DOCBOOK2XTEXI@ --xinclude --info --utf8trans-map=charmap
27+
DOCBOOK2XTEXI=@DOCBOOK2XTEXI@ --xinclude --info --utf8trans-map=charmap --to-stdout
2828

2929
-include Makefile.dep
3030

@@ -142,7 +142,7 @@ utils2man.stamp: $(cygwin-ug-net_SOURCES) man.xsl
142142
@touch $@
143143

144144
cygwin-ug-net.info: $(cygwin-ug-net_SOURCES) charmap
145-
$(AM_V_GEN)$(DOCBOOK2XTEXI) $(srcdir)/cygwin-ug-net.xml --string-param output-file=cygwin-ug-net
145+
$(AM_V_GEN)$(DOCBOOK2XTEXI) $(srcdir)/cygwin-ug-net.xml --string-param output-file=cygwin-ug-net >$@
146146

147147
cygwin-api/cygwin-api.html: $(cygwin-api_SOURCES) html.xsl
148148
$(AM_V_GEN)$(XMLTO) html -o cygwin-api/ -m $(srcdir)/html.xsl $(XMLTO_HTML_CHUNK_QUIET) $<
@@ -155,7 +155,7 @@ api2man.stamp: $(cygwin-api_SOURCES) man.xsl
155155
@touch $@
156156

157157
cygwin-api.info: $(cygwin-api_SOURCES) charmap
158-
$(AM_V_GEN)$(DOCBOOK2XTEXI) $(srcdir)/cygwin-api.xml --string-param output-file=cygwin-api
158+
$(AM_V_GEN)$(DOCBOOK2XTEXI) $(srcdir)/cygwin-api.xml --string-param output-file=cygwin-api >$@
159159

160160
# this generates a custom charmap for docbook2x-texi which has a mapping for &reg;
161161
charmap:

0 commit comments

Comments
 (0)