-OCAMLPACKAGES = -package str,unix,gettext-stub,libvirt,guestfs,v2v_test_harness
+if INSTALLED_TEST_HARNESS
+OCAMLLINKPKG =
+else
+OCAMLLINKPKG = mllib.cmxa v2v_test_harness.cmxa -cclib '-lutils -lgnu'
+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)/../../common/utils/.libs \
+ -I $(TEST_HARNESS_DIR)/../../src/.libs \
+ -I $(TEST_HARNESS_DIR)/../../gnulib/lib/.libs \
+ -I $(TEST_HARNESS_DIR)/../../mllib \
+ -I $(TEST_HARNESS_DIR)
+endif