-INCLUDES+=obj/charset/.include-stamp
-obj/charset/.include-stamp: $(addprefix charset/,$(LIBCHARSET_INCLUDES))
- build/install-includes charset run/include/charset $(?F)
- touch obj/charset/.include-stamp
+INCLUDES+=$(o)/charset/.include-stamp
+$(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
+ $(s)/build/install-includes $(s)/charset run/include/charset $(?F)
+ touch $(o)/charset/.include-stamp