Fixed loading of test_PROGRAMS

[omk.git] / snippets / sysless

diff --git a/snippets/sysless b/snippets/sysless
index 0e763a4215a14495e537da4855133eb108382a63..57eb3690081c45bc1d42f9a45086a5c5cccce73d 100644 (file)
--- a/snippets/sysless
+++ b/snippets/sysless
@@ -54,6 +54,7 @@ library-pass: include-pass
 binary-pass utils-pass: library-pass
 
 override OMK_SERIALIZE_INCLUDED = y
+MAKEOVERRIDES := $(filter-out OMK_SERIALIZE_INCLUDED=n,$(MAKEOVERRIDES))
 endif
 
 # -------------------------------------
@@ -206,7 +207,7 @@ define LOAD_PROGRAM_template
 .PHONY: load-$(1)$(3:%=-%)
 load-$(1)$(3:%=-%): $(2)/$(1)$(3:%=-%)$(LOAD_EXTENSION)
        @$(QUIET_CMD_ECHO) "  LOAD    $$<"
-       @if [ -z "$$(LOAD_CMD$(3:%=-%))" ]; then echo "No command for loading applications to '$(3)' is specified."; exit 1; fi
+       @if [ -z '$$(LOAD_CMD$(3:%=-%))' ]; then echo "No command for loading applications to '$(3)' is specified."; exit 1; fi
        $(Q) $$(LOAD_CMD$(3:%=-%)) $$<
 endef
 
@@ -225,7 +226,7 @@ run-$(1):
 endef
 
 $(foreach link,$(link_VARIANTS),$(foreach prog,$(bin_PROGRAMS),$(eval $(call LOAD_PROGRAM_template,$(prog),$(USER_BIN_DIR),$(link)))))
-$(foreach link,$(link_VARIANTS),$(foreach prog,$(test_PROGRAMS),$(eval $(call LOAD_PROGRAM_template,$(prog),$(USER_TEST_DIR),$(link)))))
+$(foreach link,$(link_VARIANTS),$(foreach prog,$(test_PROGRAMS),$(eval $(call LOAD_PROGRAM_template,$(prog),$(USER_TESTS_DIR),$(link)))))
 $(foreach link,$(link_VARIANTS),$(eval $(call LOAD_RUN_VARIANT_template,$(link))))
 
 .PHONY: load run