OCAMLFLAGS = -g -warn-error CDEFLMPSUVYZX-3-24
-OCAMLPACKAGES = -package str,unix,gettext-stub,libvirt,guestfs,v2v_test_harness
+if INSTALLED_TEST_HARNESS
+OCAMLLINKPKG =
+else
+OCAMLLINKPKG = v2v_test_harness.cmxa
+endif
+
+OCAMLPACKAGES = -package str,unix,gettext-stub,libvirt,guestfs
+OCAMLLINKPKG += -linkpkg
+
+if INSTALLED_TEST_HARNESS
+OCAMLPACKAGES += -package v2v_test_harness
+else
+OCAMLPACKAGES += -I $(TEST_HARNESS_DIR)
+endif
# XXX FIXME
# We don't distribute the xml.* files with the test harness.