Complete re-implementation of install phase.

We now do the same things as for the export phase, but rather than putting
the results into the build's export directory, we put them somewhere relative
to the INSTDIR directory.

Version 2.48. Tagged as 'HdrSrc-2_48'

!MkInstall,fd7

@@ -13,4 +13,4 @@
 | limitations under the License.
 |
 Dir <Obey$Dir>
-amu_machine install INSTDIR=Install:DDE.AcornC/C++.Libraries
+amu_machine install INSTDIR=Install:DDE.AcornC/C++.Export.<APCS> OPTIONS=ALL

Makefile

@@ -38,11 +38,19 @@
 #
 # Paths
 #
-TOPDIR   = <hdr$dir>
+ifeq ("${MAKECMDGOALS}","install")
+INSTDIR ?= <Install$Dir>.Export.<APCS>
+TOPDIR   = ${INSTDIR}.Hdr
 HDRDIR   = ${TOPDIR}.Global
-HDIR     = <CExport$dir>
-LIBDIR   = <Lib$Dir>
-INSTDIR ?= <APCSExport$Dir>
+HDIR     = ${INSTDIR}.C
+LIBDIR   = ${INSTDIR}.Lib
+else
+# i.e. this is an export phase, not install
+TOPDIR  = <hdr$dir>
+HDRDIR  = ${TOPDIR}.Global
+HDIR    = <CExport$dir>
+LIBDIR  = <Lib$Dir>
+endif
 
 include StdTools
 
@@ -142,22 +150,22 @@ EXPORTS   = \
  ${HDIR}.Global.IO.h.GenericIO \
  ${HDIR}.Global.IO.h.IOMD \
 
-INSTALLS   = \
- ${INSTDIR}.Hdr.APCS.APCS-32 \
- ${INSTDIR}.Hdr.APCS.APCS-R \
- ${INSTDIR}.Hdr.APCS.Common \
- ${INSTDIR}.Hdr.CPU.Generic26 \
- ${INSTDIR}.Hdr.CPU.Generic32 \
- ${INSTDIR}.Hdr.ListOpts \
-
 #
 # Generic rules:
 #
 
 export: ${OPTIONS} ${EXPORTS} Dirs
+ifeq ("${OPTIONS}","")
 	@echo ${COMPONENT}: export complete
+else
+	@echo ${COMPONENT}: export complete (${OPTIONS})
+endif
 
 Dirs:
+	@echo TOPDIR ${TOPDIR}
+	@echo HDRDIR ${HDRDIR}
+	@echo HDIR   ${HDIR}
+	@echo LIBDIR ${LIBDIR}
 	${MKDIR} ${HDRDIR}
 	${MKDIR} ${TOPDIR}.Interface
 	${MKDIR} ${TOPDIR}.Interface2
@@ -178,20 +186,19 @@ Dirs:
 	${MKDIR} ${HDIR}.Interface.h
 	${MKDIR} ${LIBDIR}
 
-install: install_Dirs
-	${CP} hdr ${INSTDIR}.Hdr ${CPFLAGS}
-	${ERASECVS} ${INSTDIR}.Hdr
+install: ${OPTIONS} ${EXPORTS} Dirs
+ifeq ("${OPTIONS}","")
 	@echo ${COMPONENT}: installed
-
-install_Dirs:
-	${MKDIR} ${INSTDIR}
+else
+	@echo ${COMPONENT}: installed (${OPTIONS})
+endif
 
 clean:
 	@echo ${COMPONENT}: nothing to clean
 
 #
 # Special rule for exporting all ImageSize, Machine and UserIF files.
-# Trigger by invoking the export with OPTIONS=ALL.
+# Trigger by invoking the export (or install) phase with OPTIONS=ALL.
 #
 ALL: ${HDRDIR}.Machine.Machine ${HDRDIR}.UserIF.UserIF ${HDRDIR}.HALSize.<HALSize> ${HDRDIR}.ImageSize.<ImageSize> ${HDRDIR}.APCS.<APCS>
 	${CP} hdr.Machine ${HDRDIR}.Machine ${CPFLAGS}

VersionNum

-/* (2.47)
+/* (2.48)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        2.47
+#define Module_MajorVersion_CMHG        2.48
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                12 Oct 2014
+#define Module_Date_CMHG                19 Oct 2014
 
-#define Module_MajorVersion             "2.47"
-#define Module_Version                  247
+#define Module_MajorVersion             "2.48"
+#define Module_Version                  248
 #define Module_MinorVersion             ""
-#define Module_Date                     "12 Oct 2014"
+#define Module_Date                     "19 Oct 2014"
 
-#define Module_ApplicationDate          "12-Oct-14"
+#define Module_ApplicationDate          "19-Oct-14"
 
 #define Module_ComponentName            "HdrSrc"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Programmer/HdrSrc"
 
-#define Module_FullVersion              "2.47"
-#define Module_HelpVersion              "2.47 (12 Oct 2014)"
-#define Module_LibraryVersionInfo       "2:47"
+#define Module_FullVersion              "2.48"
+#define Module_HelpVersion              "2.48 (19 Oct 2014)"
+#define Module_LibraryVersionInfo       "2:48"