Build fixes

Detail:
  Gave Components file more power to install the executable and frontend in
  different places. Iyonix-themed application directory sprites are now
  available in addition to the old Morris4 ones, and are selected based upon
  the UserIF build variable.
Admin:
  Checked frontend installs correctly.

Retagged as 'squeeze-5_09'

Makefile

@@ -32,7 +32,7 @@ TARGET2   = xpand
 CFLAGS    = -Wpc -ffah -IC:CLX -DDDE -DDEBUGGING=0
 DIRS      = o._dirs
 
-INSTAPP   = ${INSTDIR}.^.AcornC/C++.Tools.!Squeeze
+INSTAPP   = ${INSTDIR}.!Squeeze
 
 #
 # Program specific options:
@@ -64,24 +64,26 @@ install_rom:
 install: install_${INSTTYPE}
 
 install_tool_squeeze: ${TARGET}
-	${MKDIR} ${INSTDIR}.Docs
+	${MKDIR} ${INSTDIR}
 	${CP} ${TARGET} ${INSTDIR}.${TARGET} ${CPFLAGS}
 	@echo ${COMPONENT}: tool installed in library
 
 install_tool_xpand: ${TARGET2}
-	${MKDIR} ${INSTDIR}.Docs
+	${MKDIR} ${INSTDIR}
 	${CP} ${TARGET2} ${INSTDIR}.${TARGET2} ${CPFLAGS}
 	@echo ${COMPONENT}: xpand installed in library
 
-install_: install_tool_squeeze
+install_app:
 	${MKDIR} ${INSTAPP}
-	${CP} LocalRes:!Boot ${INSTAPP}.!Boot ${CPFLAGS}
-	${CP} LocalRes:!Run ${INSTAPP}.!Run ${CPFLAGS}
-	${CP} LocalRes:!Help ${INSTAPP}.!Help ${CPFLAGS}
-	${CP} LocalRes:!Sprites ${INSTAPP}.!Sprites ${CPFLAGS}
-	${CP} LocalRes:!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
-	${CP} LocalRes:Messages ${INSTAPP}.Messages ${CPFLAGS}
-	${CP} LocalRes:Templates ${INSTAPP}.Templates ${CPFLAGS}
+	${CP} LocalRes:!Boot            ${INSTAPP}.!Boot      ${CPFLAGS}
+	${CP} LocalRes:!Run             ${INSTAPP}.!Run       ${CPFLAGS}
+	${CP} LocalRes:!Help            ${INSTAPP}.!Help      ${CPFLAGS}
+	${CP} LocalRes:!Setup           ${INSTAPP}.!Setup     ${CPFLAGS}
+	${CP} LocalUserIFRes:!Sprites   ${INSTAPP}.!Sprites   ${CPFLAGS}
+	IfThere LocalUserIFRes:!Sprites11 then ${CP} LocalUserIFRes:!Sprites11 ${INSTAPP}.!Sprites11 ${CPFLAGS}
+	${CP} LocalUserIFRes:!Sprites22 ${INSTAPP}.!Sprites22 ${CPFLAGS}
+	${CP} LocalRes:Messages         ${INSTAPP}.Messages   ${CPFLAGS}
+	${CP} LocalRes:Templates        ${INSTAPP}.Templates  ${CPFLAGS}
 	${CC} -C++ -E >${INSTAPP}.Desc LocalRes:Desc
 	${TIDYDESC}  ${INSTAPP}.Desc ${INSTAPP}.Desc
 	@echo ${COMPONENT}: FrontEnd app install in '${INSTAPP}'