Commit 9d1abb93 authored by Steve Revill's avatar Steve Revill
Browse files

Minor tweaks to build and install correctly.

Detail:
  Some changes were required in order for this component to build and install
  correctly. These changes are required for the ROOL 'Disc' build.
Admin:
  Tested in Iyonix 'Disc' build using ROOL 'BuildEnv' build environment

Version 2.03. Tagged as 'xxxxMerge-2_03'
parent f39a88e4
......@@ -42,6 +42,7 @@ LD = link
RM = remove
SQUEEZE = squeeze
WIPE = -wipe
XWIPE = x wipe
CFLAGS = -c -depend !Depend -ffa -gflv ${INCLUDES} -throwback
PFLAGS = -c -depend !Depend -E -C ${INCLUDES} -throwback
......@@ -125,12 +126,12 @@ install: Resources.SysMerge.!RunImage \
@echo ${COMPONENT}: All installed (Disc)
clean:
${WIPE} oB.* ${WFLAGS}
${WIPE} oF.* ${WFLAGS}
${WIPE} oS.* ${WFLAGS}
${WIPE} pB ${WFLAGS}
${WIPE} pF ${WFLAGS}
${WIPE} pS ${WFLAGS}
${XWIPE} oB.* ${WFLAGS}
${XWIPE} oF.* ${WFLAGS}
${XWIPE} oS.* ${WFLAGS}
${XWIPE} pB ${WFLAGS}
${XWIPE} pF ${WFLAGS}
${XWIPE} pS ${WFLAGS}
${RM} Resources.BootMerge.!RunImage
${RM} Resources.FontMerge.!RunImage
${RM} Resources.SysMerge.!RunImage
......
/* (2.02)
/* (2.03)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.68.
* Last processed by srccommit version: 1.2.
*
*/
#define Module_MajorVersion_CMHG 2.02
#define Module_MajorVersion_CMHG 2.03
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 14 Dec 2002
#define Module_Date_CMHG 22 Jan 2007
#define Module_MajorVersion "2.02"
#define Module_Version 202
#define Module_MajorVersion "2.03"
#define Module_Version 203
#define Module_MinorVersion ""
#define Module_Date "14 Dec 2002"
#define Module_Date "22 Jan 2007"
#define Module_ApplicationDate "14-Dec-02"
#define Module_ApplicationDate "22-Jan-07"
#define Module_ComponentName "xxxxMerge"
#define Module_ComponentPath "RiscOS/Sources/SystemRes/Configure2/PlugIns/xxxxMerge"
#define Module_FullVersion "2.02"
#define Module_HelpVersion "2.02 (14 Dec 2002)"
#define Module_LibraryVersionInfo "2:2"
#define Module_FullVersion "2.03"
#define Module_HelpVersion "2.03 (22 Jan 2007)"
#define Module_LibraryVersionInfo "2:3"
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