Update Vulkan-Docs site build rules to match changes in that repo's M…

…akefiles (#93)

* Use new Makefile targets in the Vulkan-Docs directory

Very temporary change to ci.yml to pull from the Vulkan-Docs branch with
that change, prior to it being merged, to ensure the site build in this
repo works.

* Invoke Vulkan-Docs Antora setup correctly

* Revert temporary change before Vulkan-Docs branch was merged

Makefile

@@ -46,10 +46,14 @@ init: subrepos
 	    (echo Installing node modules in $$dir: && cd $$dir && npm install) ; \
 	done
 
-subrepos: $(REPONAMES)
+subrepos:
 	for repo in $(REPONAMES) ; do \
 	    echo Cloning $$repo && \
-	    test -d $$repo || git clone [email protected]:KhronosGroup/$$repo.git ; \
+	    if test -d $$repo ; then \
+		echo "Not cloning repo $$repo, already exists" ; \
+	    else \
+	    git clone [email protected]:KhronosGroup/$$repo.git ; \
+	    fi ; \
 	done
 
 # Build UI bundle
@@ -65,12 +69,12 @@ build-ui:
 prep-sources: prep-docs prep-guide prep-samples prep-tutorial
 
 # Prepare Vulkan-Docs
-GENPATH = Vulkan-Docs/antora/spec/modules/ROOT/partials/gen
+GENPATH = Vulkan-Docs/gen
 prep-docs:
-	make -C Vulkan-Docs -f antora/Makefile clean setup
+	cd Vulkan-Docs && ./makeSpec -clean -spec all setup_antora
 	cp $(GENPATH)/apimap.cjs \
 	   $(GENPATH)/pageMap.cjs \
-	   Vulkan-Docs/antora/spec/xrefMap.cjs \
+	   $(GENPATH)/xrefMap.cjs \
 	   docs-site/js/
 
 prep-guide: