Fixed install rule. Retagged.

!MkInstall,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine install THROWBACK=-throwback INSTDIR=<install$dir>
+amu_machine install THROWBACK=-throwback INSTDIR=<install$dir>.Library

Makefile

@@ -32,8 +32,7 @@ TARGET2   = xpand
 CFLAGS    = -Wpc -ffah -IC:CLX -DDDE -DDEBUGGING=0
 DIRS      = o._dirs
 
-INSTAPP   = ${INSTDIR}.Apps.!Squeeze
-LIBDIR    = ${INSTDIR}.Library.Acorn
+INSTAPP   = ${INSTDIR}.^.AcornC/C++.Tools.!Squeeze
 
 #
 # Program specific options:
@@ -54,24 +53,27 @@ all:    ${TARGET} ${TARGET2}
 #
 # RISC OS ROM build rules:
 #
-rom: ${TARGET} ${TARGET2}
+rom:
 	@echo ${COMPONENT}: rom module built
 
 export: export_${PHASE}
 
-install_rom: ${TARGET} ${TARGET2}
+install_rom:
 	@echo ${COMPONENT}: rom module installed
 	
-install_tool: ${TARGET} ${TARGET2}
-	${MKDIR} ${LIBDIR}.Docs
-	${CP} ${TARGET} ${LIBDIR}.${TARGET} ${CPFLAGS}
-	${CP} ${TARGET2} ${LIBDIR}.${TARGET2} ${CPFLAGS}
+install: install_${INSTTYPE}
+
+install_tool_squeeze: ${TARGET}
+	${MKDIR} ${INSTDIR}.Docs
+	${CP} ${TARGET} ${INSTDIR}.${TARGET} ${CPFLAGS}
 	@echo ${COMPONENT}: tool installed in library
 
-install: install_resources install_tool
-	@echo ${COMPONENT}: install complete
+install_tool_xpand: ${TARGET2}
+	${MKDIR} ${INSTDIR}.Docs
+	${CP} ${TARGET2} ${INSTDIR}.${TARGET2} ${CPFLAGS}
+	@echo ${COMPONENT}: xpand installed in library
 
-install_resources:
+install_: install_tool_squeeze
 	${MKDIR} ${INSTAPP}
 	${CP} LocalRes:!Boot ${INSTAPP}.!Boot ${CPFLAGS}
 	${CP} LocalRes:!Run ${INSTAPP}.!Run ${CPFLAGS}