Commit 88be7c0f authored by Ben Avison's avatar Ben Avison
Browse files

Stop `CApp` from assuming `Messages` in installed in `resources`

By contrast with `INSTRES_FILES` in `CModule`, where `Messages` is implicitly
included, `CApp` and `BasicApp` do not do this for `RES_FILES`. The native-
compilation version of `CApp` was doing duplicate installations of `Messages`,
which was at odds with the cross-compiling `CApp` and both versions of
`BasicApp`. If this version of `CApp` is used with a component that doesn't
feature a `Messages` file (such as the in-development `InetRes`) this results
in an error.

The only existing `CApp` client components that define `RES_FILES` are
`Help2` and `EditApp`, and they both explicitly list `Messages`, so this
change should not break either of them.
parent d2aadbb3
......@@ -222,8 +222,6 @@ debug: ${DBG_TARGET}
resources:
${MKDIR} ${RESFSDIR}
${TOKENCHECK} LocalRes:Messages
${CP} LocalRes:Messages ${RESFSDIR}.Messages ${CPFLAGS}
ifneq (${RES_FILES},)
${INSTRES} -I Resources.${LOCALE}.ROM,Resources.UK.ROM,Resources.ROM,Resources.${LOCALE},Resources.UK,Resources ${RESFSDIR} ${RES_FILES}
endif
......
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