diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-01-24 19:12:59 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-01-24 19:12:59 +0000 |
| commit | 5368012328bb0d7b6842976bc72ac6d090348f31 (patch) | |
| tree | 106448175fa808e5050e8223a38b70378135626f /docbook/Makefile.nmake | |
| parent | 8997fb0d899e4877e67dc287dcdd6b26904bf112 (diff) | |
Fix AsciiDoc WSDG build on Windows.
svn path=/trunk/; revision=54946
Diffstat (limited to 'docbook/Makefile.nmake')
| -rw-r--r-- | docbook/Makefile.nmake | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/docbook/Makefile.nmake b/docbook/Makefile.nmake index f14db0e8a5..90371355fa 100644 --- a/docbook/Makefile.nmake +++ b/docbook/Makefile.nmake @@ -34,13 +34,16 @@ A2X_TEXT_OPTS=$(A2X_TEXT_OPTS) --lynx # Convert an AsciiDoc document to a Docbook chapter .asciidoc.xml: + $(SH) << + PATH=/usr/bin $(A2X) --verbose \ --asciidoc-opts="--conf-file=asciidoc.conf" \ --no-xmllint \ --format=docbook --doctype=book \ $< +<< mv $*.xml $*.dbk - xmllint --xpath chapter $*.dbk > $@ + xmllint --xpath //chapter $*.dbk > $@ .SUFFIXES: .asciidoc .xml @@ -49,9 +52,10 @@ A2X_TEXT_OPTS=$(A2X_TEXT_OPTS) --lynx # in git_version.xml (if the svn version has changed). # This is done during nmake "preprocessing" so that it's done *before* # nmake gets the date/time of the dependency file(s)]. -!IF [$(SH) ./check_git_version.sh] -!ENDIF +git_version_check: _FORCE_ + $(SH) ./check_git_version.sh +git_version.xml: git_version_check # -- (Public) targets ------------------------------------------------------- @@ -265,3 +269,5 @@ release-notes-a4.pdf: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl << mv release-notes.pdf $@ +_FORCE_: ## Assumption: no file named _FORCE_ exists in the current directory + |