Commit 53d149a1 authored by Ben Avison's avatar Ben Avison
Browse files

Enable `CmdHelp` merging rule when `CUSTOMRES=no` and cross-compiling

In the cross-compiling case, a rule is defined targeting `MERGEDMSGS`, which
the phony target `resources_cmdhelp` depends on, but the definition is
conditional on `CUSTOMRES` not being `custom` or `no`.

In a use-case which is believed to be unique to LanManFS, it is required
that the resource files not be registered to ResourceFS via the Messages
module, but by LanManFS itself, both for RAM and ROM builds, but the merging
of `CmdHelp` and `Messages` files is still required. To leverage the
`Messages` merging code in `CModule`, re-enable the `MERGEDMSGS` rule when
`CUSTOMRES=no` (which is arguably the correct setting for LanManFS) but leave
it disabled for `CUSTOMRES=custom` to permit full customisation if required.
parent 89bdd845
......@@ -392,7 +392,7 @@ ${RES_OBJ}.o: ${DIRS} resources-${CMDHELP}
${RES_OBJ}.od: ${RES_OBJ}.o
${CP} $< $@
ifeq ($(filter no custom,${CUSTOMRES}),)
ifeq ($(filter custom,${CUSTOMRES}),)
${MERGEDMSGS}:
${MKDIR} ${MERGEDRDIR}/tmp
${MKDIR} ${MERGEDRDIR}/${TARGET}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment