From 9582bcb54e2cd0ea9441664fa6563e2687a9e32d Mon Sep 17 00:00:00 2001 From: Jon Leech Date: Mon, 18 Jun 2018 03:24:40 -0700 Subject: [PATCH] Minor build fixes. --- Makefile | 4 +++- genRelease | 2 +- genspec.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0438b3ec..6e2f05db 100644 --- a/Makefile +++ b/Makefile @@ -104,6 +104,7 @@ VERBOSE = # based on $(VERSIONS)) # EXTATTRIBS sets attributes for enabled extensions (set above based on # $(EXTENSIONS)) +# EXTRAATTRIBS sets additional attributes, if passed to make # ADOCOPTS options for asciidoc->HTML5 output NOTEOPTS = -a editing-notes -a implementation-guide PATCHVERSION = 78 @@ -132,7 +133,8 @@ ATTRIBOPTS = -a revnumber="$(SPECREVISION)" \ -a apititle="$(APITITLE)" \ -a stem=latexmath \ $(VERSIONATTRIBS) \ - $(EXTATTRIBS) + $(EXTATTRIBS) \ + $(EXTRAATTRIBS) ADOCEXTS = -r $(CURDIR)/config/vulkan-macros.rb -r $(CURDIR)/config/tilde_open_block.rb ADOCOPTS = -d book $(ATTRIBOPTS) $(NOTEOPTS) $(VERBOSE) $(ADOCEXTS) diff --git a/genRelease b/genRelease index 8b9090c1..da8a132d 100755 --- a/genRelease +++ b/genRelease @@ -127,7 +127,7 @@ if __name__ == '__main__': buildBranch('1.0-wsi_extensions', versions = Version1_0, extensions = khrExts, - ratified = False, + ratified = True, apititle = '(with KHR extensions)', xmlTargets = 'clobber install', specTargets = specTargets, diff --git a/genspec.py b/genspec.py index fd1c942e..264eeb4a 100644 --- a/genspec.py +++ b/genspec.py @@ -77,7 +77,7 @@ def buildRelease(label, extarg = '' if ratified: - ratifiedarg = '-a ratified_core_spec' + ratifiedarg = 'EXTRAATTRIBS="-a ratified_core_spec"' else: ratifiedarg = ''