build: Respect VALAC setting everywhere

This fixes some places where the VALAC setting was not respected

Author: rrthomas

Makefile

@@ -1,9 +1,9 @@
 VALAC = valac
 PACKAGES ?= --all
 GENERATOR_OPTS ?= --disable-devhelp --skip-existing
-VALAC_VERSION := $(shell vala --api-version | awk -F. '{ print "0."$$2 }')
-VAPIDIR := $(shell pkg-config --variable vapidir libvala-$(VALAC_VERSION))
-VALAFLAGS = -g -X -w
+VALAC_VERSION := $(shell $(VALAC) --api-version | awk -F. '{ print "0."$$2 }')
+VAPIDIRS := --vapidir $(shell pkg-config --variable vapidir libvala-$(VALAC_VERSION)) --vapidir $(shell pkg-config --variable vapidir valadoc-$(VALAC_VERSION))
+VALAFLAGS = -g -X -w $(VAPIDIRS)
 PREFIX = "stable"
 INSTALL_DIR ?= /usr/local/share/devhelp/books
 
@@ -107,7 +107,6 @@ build-data:
 build-docs: default
 	$(RM) -r tmp/
 	./generator \
-		--vapidir $(VAPIDIR) \
 		--vapidir "extra-vapis/" --vapidir "girs/vala/vapi/" \
 		--prefix $(PREFIX) \
 		--target-glib 2.98 \

src/generator.vala

@@ -58,7 +58,7 @@ public class Valadoc.IndexGenerator : Valadoc.ValadocOrgDoclet {
 
 		// Unversioned vapi directory:
 		try {
-			Process.spawn_command_line_sync ("pkg-config --variable=vapidir vapigen", out standard_output, out standard_error, out exit_status);
+			Process.spawn_command_line_sync ("pkg-config --variable=vapidir vapigen-%s".printf (Vala.API_VERSION), out standard_output, out standard_error, out exit_status);
 			if (exit_status == 0) {
 				paths += standard_output.strip ();
 			}
@@ -828,8 +828,8 @@ public class Valadoc.IndexGenerator : Valadoc.ValadocOrgDoclet {
 
 
 		StringBuilder builder = new StringBuilder ();
-		builder.append_printf ("valadoc --target-glib %s --importdir girs --doclet \"%s\" -o \"tmp/%s\" \"%s\" --vapidir \"%s\" --girdir \"%s\" %s --use-svg-images",
-			target_glib, docletpath, pkg.name, pkg.get_vapi_path (vapidirs), Path.get_dirname (pkg.get_vapi_path (vapidirs)), girdir, pkg.flags);
+		builder.append_printf ("valadoc-%s --target-glib %s --importdir girs --doclet \"%s\" -o \"tmp/%s\" \"%s\" --vapidir \"%s\" --girdir \"%s\" %s --use-svg-images",
+			Vala.API_VERSION, target_glib, docletpath, pkg.name, pkg.get_vapi_path (vapidirs), Path.get_dirname (pkg.get_vapi_path (vapidirs)), girdir, pkg.flags);
 
 		if (disable_devhelp == true) {
 			builder.append (" -X --disable-devhelp");

src/valadoc-example-tester.vala

@@ -60,7 +60,8 @@ public class ExampleTester : ExampleParser {
 	protected override void compile (string str) throws MarkupError {
 		string cmnd = str.strip ();
 
-		bool is_valac_call = str.has_prefix ("valac ");
+		const string VALAC_PREFIX = "valac ";
+		bool is_valac_call = str.has_prefix (VALAC_PREFIX);
 		bool is_schema_call = str.has_prefix ("glib-compile-schemas");
 
 		// We only check for sanity, not for safety
@@ -70,6 +71,8 @@ public class ExampleTester : ExampleParser {
 		}
 
 		if (is_valac_call) {
+			cmnd = Environment.get_variable ("VALAC") + " " +
+				cmnd.substring (VALAC_PREFIX.length);
 			cmnd += " --fatal-warnings";
 			if (example_deprecated == true) {
 				cmnd += " --enable-deprecated";