* rebase to trunk@17295avr

git-svn-id: http://svn.freepascal.org/svn/fpc/branches/avr@17296 3ad0048d-3df7-0310-abae-a5850022a9f2

17 files changed, 2736 insertions, 2532 deletions

diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index 63bc50eed0..a5ac18c138 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1,2397 +1,2466 @@
 {$ifdef Delphi}
-const fpcmakeini : array[0..219] of string[240]=(
+const fpcmakeini : array[0..229] of string[240]=(
 {$else Delphi}
-const fpcmakeini : array[0..219,1..240] of char=(
+const fpcmakeini : array[0..229,1..240] of char=(
 {$endif Delphi}
-  ';'#010+
-  '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
-  ';'#010+
+  ';'#013#010+
+  '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#013+
   #010+
-  '[defines]'#010+
-  '#####################################################################'#010+
-  '# Misc defines to be used by anyone'#010+
-  '####################################################','################'+
-  '#'#010+
-  #010+
-  '# OS categories'#010+
-  'BSDs = freebsd netbsd openbsd darwin'#010+
-  'UNIXs = linux $(BSDs) solaris qnx haiku'#010+
-  'LIMIT83fs = go32v2 os2 emx watcom'#010+
-  'OSNeedsComspecToRunBatch = go32v2 watcom'#010+
-  #010+
-  '#Empty target for rules that always should run. Need','ed if'#010+
-  '#the target is non-phoney, and there is non-phony prereqisites.'#010+
-  '#Then add FORCE as an prerequisite'#010+
-  '#See gnu make manual: 4.7 Rules without Commands or Prerequisites'#010+
-  'FORCE:'#010+
-  '.PHONY: FORCE'#010+
-  #010+
-  '[osdetect]'#010+
-  '####################################','################################'+
-  '#'#010+
-  '# Autodetect source OS (Linux or Dos or Windows NT or OS/2 or other)'#010+
-  '# define inUnix when running under Unix like environment'#010+
-  '#               (Linux,FreeBSD,NetBSD,OpenBSD,Darwin,Cygwin)'#010+
-  '# define inWinNT wh','en running under WinNT'#010+
-  '# define inOS2 when running under OS/2'#010+
-  '# define inCygwin when running under Cygwin32'#010+
-  '#####################################################################'#010+
-  #010+
-  '# We need only / in the path also remove the current dir,'#010+
-  '# a','lso remove trailing /'#039's'#010+
-  'override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))'#010+
-  #010+
-  '# Detect unix'#010+
-  '# Darwin is handled specially'#010+
-  'ifneq ($(findstring darwin,$(OSTYPE)),)'#010+
-  'inUnix=1 #darwin'#010+
-  'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+
-  'else'#010+
-  '# Deter','mine if we'#039've a unix searchpath by looking for a ;'#010+
-  '# that normally doesn'#039't exists in the unix PATH var.'#010+
-  'ifeq ($(findstring ;,$(PATH)),)'#010+
-  'inUnix=1'#010+
-  'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+
-  'else'#010+
-  'SEARCHPATH:=$(subst ;, ,$(PATH))'#010+
-  'endif'#010+
-  'en','dif'#010+
-  #010+
-  '# Add path were make is located'#010+
-  'SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))'#010+
-  #010+
-  '# Search for PWD'#010+
-  'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))'#010+
-  'ifeq ($(PWD),)'#010+
-  'PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPA','TH))))'#010+
-  'ifeq ($(PWD),)'#010+
-  '$(error You need the GNU utils package to use this Makefile)'#010+
-  'else'#010+
-  'PWD:=$(firstword $(PWD))'#010+
-  'SRCEXEEXT='#010+
-  'endif'#010+
-  'else'#010+
-  'PWD:=$(firstword $(PWD))'#010+
-  'SRCEXEEXT=.exe'#010+
-  'endif'#010+
-  #010+
-  '# Detect NT - NT sets OS to Windows_NT'#010+
-  '# Detect OS/2 - OS/','2 has OS2_SHELL defined'#010+
-  'ifndef inUnix'#010+
-  'ifeq ($(OS),Windows_NT)'#010+
-  'inWinNT=1'#010+
-  'else'#010+
-  'ifdef OS2_SHELL'#010+
-  'inOS2=1'#010+
-  'endif'#010+
-  'endif'#010+
-  'else'#010+
-  'ifneq ($(findstring cygdrive,$(PATH)),)'#010+
-  'inCygWin=1'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# The extension of batch files / scripts'#010+
-  'ifdef inUnix'#010+
-  'SRCB','ATCHEXT=.sh'#010+
-  'else'#010+
-  'ifdef inOS2'#010+
-  'SRCBATCHEXT=.cmd'#010+
-  'else'#010+
-  'SRCBATCHEXT=.bat'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'ifdef COMSPEC'#010+
-  'ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)'#010+
-  'ifndef RUNBATCH'#010+
-  'RUNBATCH=$(COMSPEC) /C'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
+  ';'#013#010+
+  #013#010+
+  '[defines]'#013#010+
+  '#####################################################################'#013+
   #010+
-  '# Path Separator, the s','ubst trick is necessary for the \ that can'#039+
-  't exists'#010+
-  '# at the end of a line'#010+
-  'ifdef inUnix'#010+
-  'PATHSEP=/'#010+
-  'else'#010+
-  'PATHSEP:=$(subst /,\,/)'#010+
-  '# cygwin bash or sh can not handle backslashs'#010+
-  'ifdef inCygWin'#010+
-  'PATHSEP=/'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Base dir'#010+
-  'ifdef PWD'#010+
-  'BASEDIR:','=$(subst \,/,$(shell $(PWD)))'#010+
-  '# For Cygwin we need to replace /cygdrive/c/ with c:/'#010+
-  'ifdef inCygWin'#010+
-  'ifneq ($(findstring /cygdrive/,$(BASEDIR)),)'#010+
-  'BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))'#010+
-  'BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))',#010+
-  'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))'#010+
-  'endif'#010+
-  'endif'#010+
-  'else'#010+
-  'BASEDIR=.'#010+
-  'endif'#010+
-  #010+
-  '# Echo is an internal command under OS/2 (and others), so it'#039's alw'+
-  'ays found'#010+
-  'ifdef inOS2'#010+
-  'ifndef ECHO'#010+
-  'ECHO:=$(strip $(wildcard $(addsuffix ','/gecho$(SRCEXEEXT),$(SEARCHPATH'+
-  '))))'#010+
-  'ifeq ($(ECHO),)'#010+
-  'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))'+
-  ')'#010+
-  'ifeq ($(ECHO),)'#010+
-  'ECHO=echo'#010+
-  'else'#010+
-  'ECHO:=$(firstword $(ECHO))'#010+
-  'endif'#010+
-  'else'#010+
-  'ECHO:=$(firstword $(ECHO))'#010+
-  'endif'#010+
-  'endif'#010+
-  'export E','CHO'#010+
-  'endif'#010+
-  #010+
-  '[fpcdetect]'#010+
-  '#####################################################################'#010+
-  '# FPC Binary and Version Detection'#010+
-  '#####################################################################'#010+
-  #010+
-  '# Compatibility with old makefiles'#010+
-  'ifndef',' FPC'#010+
-  'ifdef PP'#010+
-  'FPC=$(PP)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Try to detect the ppcXXX file to use by using "fpc -PB" option'#010+
-  '# to query for the default ppcXXX the fpc executable tries. When'#010+
-  '# fpc is not found use ppc386 by default. Also when fpc -PB gives'#010+
-  '# an er','ror ppc386 will be used.'#010+
-  'ifndef FPC'#010+
-  '# check if fpc exists'#010+
-  'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+
-  ')))'#010+
-  'ifneq ($(FPCPROG),)'#010+
-  'FPCPROG:=$(firstword $(FPCPROG))'#010+
-  'ifneq ($(CPU_TARGET),)'#010+
-  'FPC:=$(shell $(FPCPROG) -P$(CPU_','TARGET) -PB)'#010+
-  'else'#010+
-  'FPC:=$(shell $(FPCPROG) -PB)'#010+
-  'endif'#010+
-  '# Older fpc executables didn'#039't support it and return'#010+
-  '# Error: Illegal processor... If found then fallback to ppc386'#010+
-  'ifneq ($(findstring Error,$(FPC)),)'#010+
-  'override FPC=$(firstword $(strip $(','wildcard $(addsuffix /ppc386$(SRC'+
-  'EXEEXT),$(SEARCHPATH)))))'#010+
-  'else'#010+
-  '# if the cross compiler is not found, fall back to fpc'#010+
-  'ifeq ($(strip $(wildcard $(FPC))),)'#010+
-  'FPC:=$(firstword $(FPCPROG))'#010+
-  'endif'#010+
-  'endif'#010+
-  'else'#010+
-  '# fpc binary not found, fallback to ppc','386'#010+
+  '# Misc defines to be used by anyone'#013#010+
+  '#############################################','#######################'+
+  '#'#013#010+
+  #013#010+
+  '# OS categories'#013#010+
+  'BSDs = freebsd netbsd openbsd darwin'#013#010+
+  'UNIXs = linux $(BSDs) solaris qnx haiku'#013#010+
+  'LIMIT83fs = go32v2 os2 emx watcom'#013#010+
+  'OSNeedsComspecToRunBatch = go32v2 watcom'#013#010+
+  #013#010+
+  '#Empty target for rules that always s','hould run. Needed if'#013#010+
+  '#the target is non-phoney, and there is non-phony prereqisites.'#013#010+
+  '#Then add FORCE as an prerequisite'#013#010+
+  '#See gnu make manual: 4.7 Rules without Commands or Prerequisites'#013#010+
+  'FORCE:'#013#010+
+  '.PHONY: FORCE'#013#010+
+  #013#010+
+  '[osdetect]'#013#010+
+  '#############','#######################################################'+
+  '#'#013#010+
+  '# Autodetect source OS (Linux or Dos or Windows NT or OS/2 or other)'#013+
+  #010+
+  '# define inUnix when running under Unix like environment'#013#010+
+  '#               (Linux,FreeBSD,NetBSD,OpenBSD,Darwin,C','ygwin)'#013#010+
+  '# define inWinNT when running under WinNT'#013#010+
+  '# define inOS2 when running under OS/2'#013#010+
+  '# define inCygwin when running under Cygwin32'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# We need only / in the path ','also remove the current dir,'#013#010+
+  '# also remove trailing /'#039's'#013#010+
+  'override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))'#013#010+
+  #013#010+
+  '# Detect unix'#013#010+
+  '# Darwin is handled specially'#013#010+
+  'ifneq ($(findstring darwin,$(OSTYPE)),)'#013#010+
+  'inUnix=1 #darwin'#013#010+
+  'SEARCHPATH:=$(filter-','out .,$(subst :, ,$(PATH)))'#013#010+
+  'else'#013#010+
+  '# Determine if we'#039've a unix searchpath by looking for a ;'#013#010+
+  '# that normally doesn'#039't exists in the unix PATH var.'#013#010+
+  'ifeq ($(findstring ;,$(PATH)),)'#013#010+
+  'inUnix=1'#013#010+
+  'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#013,#010+
+  'else'#013#010+
+  'SEARCHPATH:=$(subst ;, ,$(PATH))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Add path were make is located'#013#010+
+  'SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))'#013#010+
+  #013#010+
+  '# Search for PWD'#013#010+
+  'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))'#013#010+
+  'ifeq ($(P','WD),)'#013#010+
+  'PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))'#013#010+
+  'ifeq ($(PWD),)'#013#010+
+  '$(error You need the GNU utils package to use this Makefile)'#013#010+
+  'else'#013#010+
+  'PWD:=$(firstword $(PWD))'#013#010+
+  'SRCEXEEXT='#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'PWD:=$(firstword $(PWD))'#013#010+
+  'SRCEXEEXT=.ex','e'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Detect NT - NT sets OS to Windows_NT'#013#010+
+  '# Detect OS/2 - OS/2 has OS2_SHELL defined'#013#010+
+  'ifndef inUnix'#013#010+
+  'ifeq ($(OS),Windows_NT)'#013#010+
+  'inWinNT=1'#013#010+
+  'else'#013#010+
+  'ifdef OS2_SHELL'#013#010+
+  'inOS2=1'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'ifneq ($(findstring cygdrive,$(PATH)),)'#013#010,
+  'inCygWin=1'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# The extension of batch files / scripts'#013#010+
+  'ifdef inUnix'#013#010+
+  'SRCBATCHEXT=.sh'#013#010+
+  'else'#013#010+
+  'ifdef inOS2'#013#010+
+  'SRCBATCHEXT=.cmd'#013#010+
+  'else'#013#010+
+  'SRCBATCHEXT=.bat'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef COMSPEC'#013#010+
+  'ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComsp','ecToRunBatch)),)'#013#010+
+  'ifndef RUNBATCH'#013#010+
+  'RUNBATCH=$(COMSPEC) /C'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Path Separator, the subst trick is necessary for the \ that can'#039't'+
+  ' exists'#013#010+
+  '# at the end of a line'#013#010+
+  'ifdef inUnix'#013#010+
+  'PATHSEP=/'#013#010+
+  'else'#013#010+
+  'PATHSEP:=$(subst /,\,/)'#013#010+
+  '# ','cygwin bash or sh can not handle backslashs'#013#010+
+  'ifdef inCygWin'#013#010+
+  'PATHSEP=/'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Base dir'#013#010+
+  'ifdef PWD'#013#010+
+  'BASEDIR:=$(subst \,/,$(shell $(PWD)))'#013#010+
+  '# For Cygwin we need to replace /cygdrive/c/ with c:/'#013#010+
+  'ifdef inCygWin'#013#010+
+  'ifneq ($(findstring',' /cygdrive/,$(BASEDIR)),)'#013#010+
+  'BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))'#013#010+
+  'BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))'#013#010+
+  'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))'#013+
+  #010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'BASEDIR=.'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Ech','o is an internal command under OS/2 (and others), so it'#039's a'+
+  'lways found'#013#010+
+  'ifdef inOS2'#013#010+
+  'ifndef ECHO'#013#010+
+  'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))'+
+  '))'#013#010+
+  'ifeq ($(ECHO),)'#013#010+
+  'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEE','XT),$(SEARCHPATH)'+
+  ')))'#013#010+
+  'ifeq ($(ECHO),)'#013#010+
+  'ECHO=echo'#013#010+
+  'else'#013#010+
+  'ECHO:=$(firstword $(ECHO))'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'ECHO:=$(firstword $(ECHO))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export ECHO'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '[fpcdetect]'#013#010+
+  '##################################################################','##'+
+  '#'#013#010+
+  '# FPC Binary and Version Detection'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# Compatibility with old makefiles'#013#010+
+  'ifndef FPC'#013#010+
+  'ifdef PP'#013#010+
+  'FPC=$(PP)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Try to detect the ppcXXX file to use by',' using "fpc -PB" option'#013+
+  #010+
+  '# to query for the default ppcXXX the fpc executable tries. When'#013#010+
+  '# fpc is not found use ppc386 by default. Also when fpc -PB gives'#013#010+
+  '# an error ppc386 will be used.'#013#010+
+  'ifndef FPC'#013#010+
+  '# check if fpc exists'#013#010+
+  'FPCPROG:=$(str','ip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPAT'+
+  'H))))'#013#010+
+  'ifneq ($(FPCPROG),)'#013#010+
+  'FPCPROG:=$(firstword $(FPCPROG))'#013#010+
+  'ifneq ($(CPU_TARGET),)'#013#010+
+  'FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)'#013#010+
+  'else'#013#010+
+  'FPC:=$(shell $(FPCPROG) -PB)'#013#010+
+  'endif'#013#010+
+  '# Older fpc',' executables didn'#039't support it and return'#013#010+
+  '# Error: Illegal processor... If found then fallback to ppc386'#013#010+
+  'ifneq ($(findstring Error,$(FPC)),)'#013#010+
   'override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEX'+
-  'EEXT),$(SEARCHPATH)))))'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Get a clean executable name'#010+
-  'override FPC:=$(subst $(SRCEXEEXT),,$(FPC))'#010+
-  'override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)'#010+
-  #010+
-  '# Try to',' find the binary direct first, otherwise in the path,'#010+
-  '# if not found give an error'#010+
-  'FOUNDFPC:=$(strip $(wildcard $(FPC)))'#010+
-  'ifeq ($(FOUNDFPC),)'#010+
-  'FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))'#010+
-  'ifeq ($(FOUNDFPC),)'#010+
-  '$(error Compil','er $(FPC) not found)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# For 1.1 and up we can use a single compiler call to retrieve'#010+
-  '# all needed information'#010+
-  'ifndef FPC_COMPILERINFO'#010+
-  'FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#010+
-  'endif'#010+
-  #010+
-  '# FPC version'#010+
-  'ifndef FPC_VERSION'#010+
-  'FPC_VERS','ION:=$(word 1,$(FPC_COMPILERINFO))'#010+
-  'endif'#010+
-  #010+
-  'export FPC FPC_VERSION FPC_COMPILERINFO'#010+
-  '# CHECKDEPEND should not be exported'#010+
-  '# This should limit multiple checks'#010+
-  'unexport CHECKDEPEND ALLDEPENDENCIES'#010+
-  #010+
-  '###############################################','#####################'+
-  '#'#010+
-  '# FPC Target Detection'#010+
-  '#####################################################################'#010+
-  #010+
-  '# Fall back to default values if needed'#010+
-  'ifndef CPU_TARGET'#010+
-  'ifdef CPU_TARGET_DEFAULT'#010+
-  'CPU_TARGET=$(CPU_TARGET_DEFAULT)'#010+
-  'endif'#010+
-  'e','ndif'#010+
-  'ifndef OS_TARGET'#010+
-  'ifdef OS_TARGET_DEFAULT'#010+
-  'OS_TARGET=$(OS_TARGET_DEFAULT)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# For 1.0.x we need to use extra calls to retrieve all info'#010+
-  'ifneq ($(words $(FPC_COMPILERINFO)),5)'#010+
-  'FPC_COMPILERINFO+=$(shell $(FPC) -iSP)'#010+
-  'FPC_COMPILER','INFO+=$(shell $(FPC) -iTP)'#010+
-  'FPC_COMPILERINFO+=$(shell $(FPC) -iSO)'#010+
-  'FPC_COMPILERINFO+=$(shell $(FPC) -iTO)'#010+
-  'endif'#010+
-  #010+
-  '# Retrieve Target/Source CPU and Target/Source OS'#010+
-  'ifndef CPU_SOURCE'#010+
-  'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#010+
-  'endif'#010+
-  'ifndef CPU_T','ARGET'#010+
-  'CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))'#010+
-  'endif'#010+
-  'ifndef OS_SOURCE'#010+
-  'OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))'#010+
-  'endif'#010+
-  'ifndef OS_TARGET'#010+
-  'OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))'#010+
-  'endif'#010+
-  'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
-  'FULL_SOURCE=$(CPU_S','OURCE)-$(OS_SOURCE)'#010+
-  #010+
-  'ifeq ($(CPU_TARGET),armeb)'#010+
-  'ARCH=arm'#010+
-  'override FPCOPT+=-Cb'#010+
-  'else'#010+
-  'ifeq ($(CPU_TARGET),armel)'#010+
-  'ARCH=arm'#010+
-  'override FPCOPT+=-CaEABI'#010+
-  'else'#010+
-  'ARCH=$(CPU_TARGET)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Full name of the target, including CPU and OS. For OSs li','mited'#010+
-  '# to 8.3 we only use the target OS'#010+
-  'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+
-  'TARGETSUFFIX=$(OS_TARGET)'#010+
-  'SOURCESUFFIX=$(OS_SOURCE)'#010+
-  'else'#010+
-  'TARGETSUFFIX=$(FULL_TARGET)'#010+
-  'SOURCESUFFIX=$(FULL_SOURCE)'#010+
-  'endif'#010+
-  #010+
-  '# Cross compile flag'#010+
-  'ifneq ($(','FULL_TARGET),$(FULL_SOURCE))'#010+
-  'CROSSCOMPILE=1'#010+
-  'endif'#010+
-  #010+
-  '# Check if the Makefile supports this target, but not'#010+
-  '# when the make target is to rebuild the makefile'#010+
-  'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+
-  'ifeq ($(findstring $(FULL_TARGET),$(MA','KEFILETARGETS)),)'#010+
+  'EEXT),$(SEARCHPATH)))))'#013#010+
+  'e','lse'#013#010+
+  '# if the cross compiler is not found, fall back to fpc'#013#010+
+  'ifeq ($(strip $(wildcard $(FPC))),)'#013#010+
+  'FPC:=$(firstword $(FPCPROG))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  '# fpc binary not found, fallback to ppc386'#013#010+
+  'override FPC=$(firstword $(strip $(wildcard $(ad','dsuffix /ppc386$(SRC'+
+  'EXEEXT),$(SEARCHPATH)))))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Get a clean executable name'#013#010+
+  'override FPC:=$(subst $(SRCEXEEXT),,$(FPC))'#013#010+
+  'override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)'#013#010+
+  #013#010+
+  '# Try to find the binary direct first, otherwise in ','the path,'#013#010+
+  '# if not found give an error'#013#010+
+  'FOUNDFPC:=$(strip $(wildcard $(FPC)))'#013#010+
+  'ifeq ($(FOUNDFPC),)'#013#010+
+  'FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))'#013#010+
+  'ifeq ($(FOUNDFPC),)'#013#010+
+  '$(error Compiler $(FPC) not found)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010,
+  '# For 1.1 and up we can use a single compiler call to retrieve'#013#010+
+  '# all needed information'#013#010+
+  'ifndef FPC_COMPILERINFO'#013#010+
+  'FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# FPC version'#013#010+
+  'ifndef FPC_VERSION'#013#010+
+  'FPC_VERSION:=$(word 1,$(FPC_COMPIL','ERINFO))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'export FPC FPC_VERSION FPC_COMPILERINFO'#013#010+
+  '# CHECKDEPEND should not be exported'#013#010+
+  '# This should limit multiple checks'#013#010+
+  'unexport CHECKDEPEND ALLDEPENDENCIES'#013#010+
+  #013#010+
+  '#################################################################','###'+
+  '#'#013#010+
+  '# FPC Target Detection'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# Fall back to default values if needed'#013#010+
+  'ifndef CPU_TARGET'#013#010+
+  'ifdef CPU_TARGET_DEFAULT'#013#010+
+  'CPU_TARGET=$(CPU_TARGET_DEFAULT)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'ifn','def OS_TARGET'#013#010+
+  'ifdef OS_TARGET_DEFAULT'#013#010+
+  'OS_TARGET=$(OS_TARGET_DEFAULT)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# For 1.0.x we need to use extra calls to retrieve all info'#013#010+
+  'ifneq ($(words $(FPC_COMPILERINFO)),5)'#013#010+
+  'FPC_COMPILERINFO+=$(shell $(FPC) -iSP)'#013#010+
+  'FPC_COMPILE','RINFO+=$(shell $(FPC) -iTP)'#013#010+
+  'FPC_COMPILERINFO+=$(shell $(FPC) -iSO)'#013#010+
+  'FPC_COMPILERINFO+=$(shell $(FPC) -iTO)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Retrieve Target/Source CPU and Target/Source OS'#013#010+
+  'ifndef CPU_SOURCE'#013#010+
+  'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#013#010+
+  'endif'#013#010+
+  'if','ndef CPU_TARGET'#013#010+
+  'CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))'#013#010+
+  'endif'#013#010+
+  'ifndef OS_SOURCE'#013#010+
+  'OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))'#013#010+
+  'endif'#013#010+
+  'ifndef OS_TARGET'#013#010+
+  'OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))'#013#010+
+  'endif'#013#010+
+  'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#013,#010+
+  'FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#013#010+
+  #013#010+
+  'ifeq ($(CPU_TARGET),armeb)'#013#010+
+  'ARCH=arm'#013#010+
+  'override FPCOPT+=-Cb'#013#010+
+  'else'#013#010+
+  'ifeq ($(CPU_TARGET),armel)'#013#010+
+  'ARCH=arm'#013#010+
+  'override FPCOPT+=-CaEABI'#013#010+
+  'else'#013#010+
+  'ARCH=$(CPU_TARGET)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Full name of the target',', including CPU and OS. For OSs limited'#013+
+  #010+
+  '# to 8.3 we only use the target OS'#013#010+
+  'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#013#010+
+  'TARGETSUFFIX=$(OS_TARGET)'#013#010+
+  'SOURCESUFFIX=$(OS_SOURCE)'#013#010+
+  'else'#013#010+
+  'TARGETSUFFIX=$(FULL_TARGET)'#013#010+
+  'SOURCESUFFIX=$(FULL_SOUR','CE)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Cross compile flag'#013#010+
+  'ifneq ($(FULL_TARGET),$(FULL_SOURCE))'#013#010+
+  'CROSSCOMPILE=1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Check if the Makefile supports this target, but not'#013#010+
+  '# when the make target is to rebuild the makefile'#013#010+
+  'ifeq ($(findstring makefile,$(MAKE','CMDGOALS)),)'#013#010+
+  'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)'#013#010+
   '$(error The Makefile doesn'#039't support target $(FULL_TARGET), please'+
-  ' run fpcmake first)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '# Detect BSD, since BSD uses a slightly different directory hierarchy.'+
-  #010+
-  'ifneq ($(findstring $(OS_TARGET),$(BSDs)),)'#010+
-  'BSDhier','=1'#010+
-  'endif'#010+
-  #010+
-  '# Detect Linux, will also use its own directory hierarchy.'#010+
-  'ifeq ($(OS_TARGET),linux)'#010+
-  'linuxHier=1'#010+
-  'endif'#010+
-  #010+
-  'export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL'+
-  '_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+
-  #010+
-  #010+
-  '[fpcdir','checkenv]'#010+
-  '#####################################################################'#010+
-  '# FPCDIR Setting'#010+
-  '#####################################################################'#010+
-  #010+
-  '# Test FPCDIR to look if the RTL dir exists'#010+
-  'ifdef FPCDIR'#010+
-  'override FPCDIR',':=$(subst \,/,$(FPCDIR))'#010+
-  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
-  'override FPCDIR=wrong'#010+
-  'endif'#010+
-  'else'#010+
-  'override FPCDIR=wrong'#010+
-  'endif'#010+
-  #010+
-  '# Default FPCDIR from Makefile.fpc'#010+
-  'ifdef DEFAULT_FPCDIR'#010+
-  'ifeq ($(FPCDIR),wrong)'#010+
-  'override FPCDIR:=$(s','ubst \,/,$(DEFAULT_FPCDIR))'#010+
-  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
-  'override FPCDIR=wrong'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '[fpcdirdetect]'#010+
-  '# Detect FPCDIR'#010+
-  'ifeq ($(FPCDIR),wrong)'#010+
-  'ifdef inUnix'#010+
-  'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010,
-  'ifeq ($(wildcard $(FPCDIR)/units),)'#010+
-  'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+
-  'endif'#010+
-  'else'#010+
-  'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+
-  'suffix /$(FPC),$(SEARCHPATH))))))'#010+
-  'override FPCDIR:=$(FPCDIR)/..'#010+
-  'ifeq ($(wildcar','d $(addprefix $(FPCDIR)/,rtl units)),)'#010+
-  'override FPCDIR:=$(FPCDIR)/..'#010+
-  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
-  'override FPCDIR:=$(BASEDIR)'#010+
-  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
-  'override FPCDIR=c:/pp'#010+
-  'endif'#010+
-  'endif'#010+
-  'e','ndif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Cross binaries dir'#010+
-  'ifndef CROSSBINDIR'#010+
-  'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+
-  'endif'#010+
-  #010+
-  '# Default binutils prefix for cross compile when the'#010+
-  '# crossbindir is not set (except for Darwin)'#010+
-  'ifneq ($(findstring $(','OS_TARGET),darwin iphonesim),)'#010+
-  'ifeq ($(OS_SOURCE),darwin)'#010+
-  'DARWIN2DARWIN=1'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'ifndef BINUTILSPREFIX'#010+
-  'ifndef CROSSBINDIR'#010+
-  'ifdef CROSSCOMPILE'#010+
-  'ifndef DARWIN2DARWIN'#010+
-  'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Tr','y first the full target name, otherwise try only'#010+
-  '# the OS for backwards compatibility'#010+
-  'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+
-  'ifeq ($(UNITSDIR),)'#010+
-  'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+
-  'endif'#010+
-  #010+
-  '# Packages dir'#010+
-  'PACKAGE','SDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packa'+
-  'ges/base $(FPCDIR)/packages/extra)'#010+
-  #010+
-  #010+
-  '[shelltools]'#010+
-  '#####################################################################'#010+
-  '# Shell tools'#010+
-  '#############################################','#######################'+
-  '#'#010+
-  #010+
-  '# Echo that can redir (must be able run in the default OS shell)'#010+
-  'ifndef ECHOREDIR'#010+
-  'ifndef inUnix'#010+
-  'ECHOREDIR=echo'#010+
-  'else'#010+
-  'ECHOREDIR=$(ECHO)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# To copy pograms'#010+
-  'ifndef COPY'#010+
-  'COPY:=$(CPPROG) -fp'#010+
-  'endif'#010+
-  #010+
-  '# Copy a w','hole tree'#010+
-  'ifndef COPYTREE'#010+
-  'COPYTREE:=$(CPPROG) -Rfp'#010+
-  'endif'#010+
-  #010+
-  '# Copy a whole tree'#010+
-  'ifndef MKDIRTREE'#010+
-  'MKDIRTREE:=$(MKDIRPROG) -p'#010+
-  'endif'#010+
-  #010+
-  '# To move pograms'#010+
-  'ifndef MOVE'#010+
-  'MOVE:=$(MVPROG) -f'#010+
-  'endif'#010+
-  #010+
-  '# Check delete program'#010+
-  'ifndef DEL'#010+
-  'DEL:=$(RMPROG) -f'#010+
-  'end','if'#010+
-  #010+
-  '# Check deltree program'#010+
-  'ifndef DELTREE'#010+
-  'DELTREE:=$(RMPROG) -rf'#010+
-  'endif'#010+
-  #010+
-  '# To install files'#010+
-  'ifndef INSTALL'#010+
-  'ifdef inUnix'#010+
-  'INSTALL:=$(GINSTALL) -c -m 644'#010+
-  'else'#010+
-  'INSTALL:=$(COPY)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# To install programs'#010+
-  'ifndef INSTALLEXE'#010+
-  'ifdef inUnix'#010+
-  'I','NSTALLEXE:=$(GINSTALL) -c -m 755'#010+
-  'else'#010+
-  'INSTALLEXE:=$(COPY)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# To make a directory.'#010+
-  'ifndef MKDIR'#010+
-  'MKDIR:=$(GINSTALL) -m 755 -d'#010+
-  'endif'#010+
-  #010+
+  ' run fpcmake first)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '# Detect BSD, since BSD uses a slightly different directory hier','arch'+
+  'y.'#013#010+
+  'ifneq ($(findstring $(OS_TARGET),$(BSDs)),)'#013#010+
+  'BSDhier=1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Detect Linux, will also use its own directory hierarchy.'#013#010+
+  'ifeq ($(OS_TARGET),linux)'#013#010+
+  'linuxHier=1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL','_TARGET FU'+
+  'LL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#013#010+
+  #013#010+
+  #013#010+
+  '[fpcdircheckenv]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# FPCDIR Setting'#013#010+
+  '#####################################################################',
+  #013#010+
+  #013#010+
+  '# Test FPCDIR to look if the RTL dir exists'#013#010+
+  'ifdef FPCDIR'#013#010+
+  'override FPCDIR:=$(subst \,/,$(FPCDIR))'#013#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
+  'override FPCDIR=wrong'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'override FPCDIR=wrong'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Default FPC','DIR from Makefile.fpc'#013#010+
+  'ifdef DEFAULT_FPCDIR'#013#010+
+  'ifeq ($(FPCDIR),wrong)'#013#010+
+  'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#013#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
+  'override FPCDIR=wrong'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '[fpcdirdetect]'#013#010+
+  '# Det','ect FPCDIR'#013#010+
+  'ifeq ($(FPCDIR),wrong)'#013#010+
+  'ifdef inUnix'#013#010+
+  'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#013#010+
+  'ifeq ($(wildcard $(FPCDIR)/units),)'#013#010+
+  'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'override FPCDIR:=$(subst /$(FPC),,$(firstwor','d $(strip $(wildcard $(a'+
+  'ddsuffix /$(FPC),$(SEARCHPATH))))))'#013#010+
+  'override FPCDIR:=$(FPCDIR)/..'#013#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
+  'override FPCDIR:=$(FPCDIR)/..'#013#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
+  'overrid','e FPCDIR:=$(BASEDIR)'#013#010+
+  'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#013#010+
+  'override FPCDIR=c:/pp'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Cross binaries dir'#013#010+
+  'ifndef CROSSBINDIR'#013#010+
+  'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#013#010+
+  'endif',#013#010+
+  #013#010+
+  '# Default binutils prefix for cross compile when the'#013#010+
+  '# crossbindir is not set (except for Darwin)'#013#010+
+  'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#013#010+
+  'ifeq ($(OS_SOURCE),darwin)'#013#010+
+  'DARWIN2DARWIN=1'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifndef BINUTILSPREFIX',#013#010+
+  'ifndef CROSSBINDIR'#013#010+
+  'ifdef CROSSCOMPILE'#013#010+
+  'ifndef DARWIN2DARWIN'#013#010+
+  'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Try first the full target name, otherwise try only'#013#010+
+  '# the OS for backwards compatibility'#013#010+
+  'UNITSDIR:=','$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#013#010+
+  'ifeq ($(UNITSDIR),)'#013#010+
+  'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Packages dir'#013#010+
+  'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/package'+
+  's/base $(FPCDIR)/packages/e','xtra)'#013#010+
+  #013#010+
+  #013#010+
+  '[shelltools]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Shell tools'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# Echo that can redir (must be able run in the default O','S shell)'#013+
+  #010+
+  'ifndef ECHOREDIR'#013#010+
+  'ifndef inUnix'#013#010+
+  'ECHOREDIR=echo'#013#010+
+  'else'#013#010+
+  'ECHOREDIR=$(ECHO)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# To copy pograms'#013#010+
+  'ifndef COPY'#013#010+
+  'COPY:=$(CPPROG) -fp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Copy a whole tree'#013#010+
+  'ifndef COPYTREE'#013#010+
+  'COPYTREE:=$(CPPROG) -Rfp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Cop','y a whole tree'#013#010+
+  'ifndef MKDIRTREE'#013#010+
+  'MKDIRTREE:=$(MKDIRPROG) -p'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# To move pograms'#013#010+
+  'ifndef MOVE'#013#010+
+  'MOVE:=$(MVPROG) -f'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Check delete program'#013#010+
+  'ifndef DEL'#013#010+
+  'DEL:=$(RMPROG) -f'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Check deltree program'#013#010+
+  'ifndef DELTREE'#013#010+
+  'DEL','TREE:=$(RMPROG) -rf'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# To install files'#013#010+
+  'ifndef INSTALL'#013#010+
+  'ifdef inUnix'#013#010+
+  'INSTALL:=$(GINSTALL) -c -m 644'#013#010+
+  'else'#013#010+
+  'INSTALL:=$(COPY)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# To install programs'#013#010+
+  'ifndef INSTALLEXE'#013#010+
+  'ifdef inUnix'#013#010+
+  'INSTALLEXE:=$(GINSTALL) -c -m 75','5'#013#010+
+  'else'#013#010+
+  'INSTALLEXE:=$(COPY)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# To make a directory.'#013#010+
+  'ifndef MKDIR'#013#010+
+  'MKDIR:=$(GINSTALL) -m 755 -d'#013#010+
+  'endif'#013#010+
+  #013#010+
   'export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKD'+
-  'IR'#010+
-  #010+
-  #010+
-  '[defaultdirs]'#010+
-  '########','############################################################'+
-  '#'#010+
-  '# Default Directories'#010+
-  '#####################################################################'#010+
-  #010+
-  '# Units dir'#010+
-  'ifdef REQUIRE_UNITSDIR'#010+
-  'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+
-  'endif'#010+
-  #010+
-  '# Un','its dir'#010+
-  'ifdef REQUIRE_PACKAGESDIR'#010+
-  'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+
-  '# When zipping use the target os default, when normal install then'#010+
-  '# use the source os as default'#010+
-  'ifdef ZI','PINSTALL'#010+
-  '# Zipinstall'#010+
-  'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+
-  'UNIXHier=1'#010+
-  'endif'#010+
-  'else'#010+
-  '# Normal install'#010+
-  'ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)'#010+
-  'UNIXHier=1'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# When install prefix is not set try to use prefix'#010+
-  'ifndef INSTALL','_PREFIX'#010+
-  'ifdef PREFIX'#010+
-  'INSTALL_PREFIX=$(PREFIX)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# set the prefix directory where to install everything'#010+
-  'ifndef INSTALL_PREFIX'#010+
-  'ifdef UNIXHier'#010+
-  'INSTALL_PREFIX=/usr/local'#010+
-  'else'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010+
-  'INSTALL_BASEDIR:=/pp'#010+
-  'else'#010+
-  'INSTALL','_BASEDIR:=/$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'export INSTALL_PREFIX'#010+
-  #010+
-  '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+
-  '# used recursively for all subdirs'#010+
-  'ifdef INSTALL_FPCSUBDIR'#010+
-  'export INSTALL_FPCSUBDIR'#010+
-  'endif'#010+
-  #010+
-  '# Where to place the resulti','ng zip files'#010+
-  'ifndef DIST_DESTDIR'#010+
-  'DIST_DESTDIR:=$(BASEDIR)'#010+
-  'endif'#010+
-  'export DIST_DESTDIR'#010+
-  #010+
-  '# EXE/PPU Target directories'#010+
-  'ifndef COMPILER_UNITTARGETDIR'#010+
-  'ifdef PACKAGEDIR_MAIN'#010+
-  'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+
-  'else'#010+
-  'COMPI','LER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+
-  'endif'#010+
-  'endif'#010+
-  'ifndef COMPILER_TARGETDIR'#010+
-  'COMPILER_TARGETDIR=.'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '#####################################################################'#010+
-  '# Install Directories'#010+
-  '#########################################','###########################'+
-  '#'#010+
-  #010+
-  '# set the base directory where to install everything'#010+
-  'ifndef INSTALL_BASEDIR'#010+
-  'ifdef UNIXHier'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010+
-  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+
-  'else'#010+
-  'INSTALL_BASEDIR:=$(INSTALL_PREF','IX)/lib/$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'else'#010+
-  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# set the directory where to install the binaries'#010+
-  'ifndef INSTALL_BINDIR'#010+
-  'ifdef UNIXHier'#010+
-  'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+
-  'else'#010+
-  'INSTALL_BINDIR:=$(INSTALL_B','ASEDIR)/bin'#010+
-  '# for FPC packages install the binaries under their target subdir'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010+
-  'ifdef CROSSCOMPILE'#010+
-  'ifdef CROSSINSTALL'#010+
-  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+
-  'else'#010+
-  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSU','FFIX)'#010+
-  'endif'#010+
-  'else'#010+
-  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# set the directory where to install the units.'#010+
-  'ifndef INSTALL_UNITDIR'#010+
-  'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+
-  'ifdef INSTALL_FPCPA','CKAGE'#010+
-  'ifdef PACKAGE_NAME'#010+
-  'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where to install shared libraries'#010+
-  'ifndef INSTALL_LIBDIR'#010+
-  'ifdef UNIXHier'#010+
-  'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+
-  'else'#010+
-  'INSTALL_LIBDIR:=$(INSTALL_UN','ITDIR)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where the source files will be stored'#010+
-  'ifndef INSTALL_SOURCEDIR'#010+
-  'ifdef UNIXHier'#010+
-  'ifdef BSDhier'#010+
-  'SRCPREFIXDIR=share/src'#010+
-  'else'#010+
-  'ifdef linuxHier'#010+
-  'SRCPREFIXDIR=share/src'#010+
-  'else'#010+
-  'SRCPREFIXDIR=src'#010+
-  'endif'#010+
-  'endif'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010,
-  'ifdef INSTALL_FPCSUBDIR'#010+
+  'IR'#013#010+
+  #013#010+
+  #013#010+
+  '[defaultdirs]'#013#010+
+  '########################','############################################'+
+  '#'#013#010+
+  '# Default Directories'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# Units dir'#013#010+
+  'ifdef REQUIRE_UNITSDIR'#013#010+
+  'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Units dir',#013#010+
+  'ifdef REQUIRE_PACKAGESDIR'#013#010+
+  'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '# Unixes use unix dirs with /usr/bin, /usr/lib'#013#010+
+  '# When zipping use the target os default, when normal install then'#013+
+  #010+
+  '# use the source os as default'#013#010+
+  'ifdef ','ZIPINSTALL'#013#010+
+  '# Zipinstall'#013#010+
+  'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#013#010+
+  'UNIXHier=1'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  '# Normal install'#013#010+
+  'ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)'#013#010+
+  'UNIXHier=1'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# When install prefix is not set try to use prefix'#013,#010+
+  'ifndef INSTALL_PREFIX'#013#010+
+  'ifdef PREFIX'#013#010+
+  'INSTALL_PREFIX=$(PREFIX)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# set the prefix directory where to install everything'#013#010+
+  'ifndef INSTALL_PREFIX'#013#010+
+  'ifdef UNIXHier'#013#010+
+  'INSTALL_PREFIX=/usr/local'#013#010+
+  'else'#013#010+
+  'ifdef INSTALL_FPCPACKAGE'#013#010+
+  'INSTAL','L_BASEDIR:=/pp'#013#010+
+  'else'#013#010+
+  'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export INSTALL_PREFIX'#013#010+
+  #013#010+
+  '# Export also INSTALL_SOURCESUBDIR set so it will be'#013#010+
+  '# used recursively for all subdirs'#013#010+
+  'ifdef INSTALL_FPCSUBDIR'#013#010+
+  'export INSTALL_FPCSUBD','IR'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Where to place the resulting zip files'#013#010+
+  'ifndef DIST_DESTDIR'#013#010+
+  'DIST_DESTDIR:=$(BASEDIR)'#013#010+
+  'endif'#013#010+
+  'export DIST_DESTDIR'#013#010+
+  #013#010+
+  '# EXE/PPU Target directories'#013#010+
+  'ifndef COMPILER_UNITTARGETDIR'#013#010+
+  'ifdef PACKAGEDIR_MAIN'#013#010+
+  'COMPILER_UNITTARGETDIR=$','(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#013#010+
+  'else'#013#010+
+  'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'ifndef COMPILER_TARGETDIR'#013#010+
+  'COMPILER_TARGETDIR=.'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '#####################################################################'#013+
+  #010+
+  '# ','Install Directories'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# set the base directory where to install everything'#013#010+
+  'ifndef INSTALL_BASEDIR'#013#010+
+  'ifdef UNIXHier'#013#010+
+  'ifdef INSTALL_FPCPACKAGE'#013#010+
+  'INSTALL_BASEDIR:=$(INSTALL','_PREFIX)/lib/fpc/$(FPC_VERSION)'#013#010+
+  'else'#013#010+
+  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# set the directory where to install the binaries'#013#010+
+  'ifndef INSTALL_BINDIR'#013#010+
+  'ifdef ','UNIXHier'#013#010+
+  'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#013#010+
+  'else'#013#010+
+  'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#013#010+
+  '# for FPC packages install the binaries under their target subdir'#013#010+
+  'ifdef INSTALL_FPCPACKAGE'#013#010+
+  'ifdef CROSSCOMPILE'#013#010+
+  'ifdef CROSSINSTALL'#013#010+
+  'INSTALL_BIND','IR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#013#010+
+  'else'#013#010+
+  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# set the directory where to install the units.'#013#010+
+  'i','fndef INSTALL_UNITDIR'#013#010+
+  'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#013#010+
+  'ifdef INSTALL_FPCPACKAGE'#013#010+
+  'ifdef PACKAGE_NAME'#013#010+
+  'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Where to install shared libraries'#013,#010+
+  'ifndef INSTALL_LIBDIR'#013#010+
+  'ifdef UNIXHier'#013#010+
+  'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#013#010+
+  'else'#013#010+
+  'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Where the source files will be stored'#013#010+
+  'ifndef INSTALL_SOURCEDIR'#013#010+
+  'ifdef UNIXHier'#013#010+
+  'ifdef BSDhier'#013#010+
+  'SRCPR','EFIXDIR=share/src'#013#010+
+  'else'#013#010+
+  'ifdef linuxHier'#013#010+
+  'SRCPREFIXDIR=share/src'#013#010+
+  'else'#013#010+
+  'SRCPREFIXDIR=src'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'ifdef INSTALL_FPCPACKAGE'#013#010+
+  'ifdef INSTALL_FPCSUBDIR'#013#010+
   'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+
-  ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+
-  'else'#010+
+  ')/$(INSTALL_FPC','SUBDIR)/$(PACKAGE_NAME)'#013#010+
+  'else'#013#010+
   'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+
-  ')/$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'else'#010+
-  'INS','TALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+
-  '-$(PACKAGE_VERSION)'#010+
-  'endif'#010+
-  'else'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010+
-  'ifdef INSTALL_FPCSUBDIR'#010+
+  ')/$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+
+  '(PACKAGE_VERSION)'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'ifdef',' INSTALL_FPCPACKAGE'#013#010+
+  'ifdef INSTALL_FPCSUBDIR'#013#010+
   'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+
-  'CKAGE_NAME)'#010+
-  'else'#010+
-  'INSTALL_','SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'else'#010+
-  'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where the doc files will be stored'#010+
-  'ifndef INSTALL_DOCDIR'#010+
-  'ifdef UNIXHier'#010+
-  'ifdef BSDhier'#010+
-  'DOCPREFIXDIR=share/doc'#010+
-  'e','lse'#010+
-  'ifdef linuxHier'#010+
-  'DOCPREFIXDIR=share/doc'#010+
-  'else'#010+
-  'DOCPREFIXDIR=doc'#010+
-  'endif'#010+
-  'endif'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010+
+  'CKAGE_NAME)'#013#010+
+  'else'#013#010+
+  'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'INSTALL_SOURCEDIR:=$(INSTALL_B','ASEDIR)/source'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Where the doc files will be stored'#013#010+
+  'ifndef INSTALL_DOCDIR'#013#010+
+  'ifdef UNIXHier'#013#010+
+  'ifdef BSDhier'#013#010+
+  'DOCPREFIXDIR=share/doc'#013#010+
+  'else'#013#010+
+  'ifdef linuxHier'#013#010+
+  'DOCPREFIXDIR=share/doc'#013#010+
+  'else'#013#010+
+  'DOCPREFIXDIR=doc'#013#010+
+  'endif'#013#010+
+  'endif'#013#010,
+  'ifdef INSTALL_FPCPACKAGE'#013#010+
   'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+
-  '(PACKAGE_NAME)'#010+
-  'else'#010+
-  'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR',')/$(PACKAGE_NAME)-$('+
-  'PACKAGE_VERSION)'#010+
-  'endif'#010+
-  'else'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010+
-  'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+
-  'else'#010+
-  'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where to install the examples, under linux we u','se the doc dir'#010+
-  '# because the copytree command will create a subdir itself'#010+
-  'ifndef INSTALL_EXAMPLEDIR'#010+
-  'ifdef UNIXHier'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010+
-  #010+
-  'ifdef BSDhier'#010+
+  '(PACKAGE_NAME)'#013#010+
+  'else'#013#010+
+  'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+
+  'CKAGE_VERSION)'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'ifdef INSTALL_FPCPACKAG','E'#013#010+
+  'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#013#010+
+  'else'#013#010+
+  'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Where to install the examples, under linux we use the doc dir'#013#010+
+  '# because the copytree command will create a su','bdir itself'#013#010+
+  'ifndef INSTALL_EXAMPLEDIR'#013#010+
+  'ifdef UNIXHier'#013#010+
+  'ifdef INSTALL_FPCPACKAGE'#013#010+
+  #013#010+
+  'ifdef BSDhier'#013#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+
-  ')/$(PACKAGE_NAM','E)'#010+
-  'else'#010+
-  'ifdef linuxHier'#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+
-  'else'#010+
+  ')/$(PACKAGE_NAME)'#013#010+
+  'else'#013#010+
+  'ifdef linuxHier'#013#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL','_DOCDIR)/examples'#013#010+
+  'else'#013#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+
-  '$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'else'#010+
-  #010+
-  'ifdef BSDhier'#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/e','xamples/$(PACKAGE_NAME)'+
-  '-$(PACKAGE_VERSION)'#010+
-  'else'#010+
-  'ifdef linuxHier'#010+
+  '$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'else'#013#010+
+  #013#010+
+  'ifdef BSDhier'#013#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+
+  '(PACKAGE_VERSION)'#013#010,
+  'else'#013#010+
+  'ifdef linuxHier'#013#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+
-  'GE_VERSION)'#010+
-  'else'#010+
+  'GE_VERSION)'#013#010+
+  'else'#013#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+
-  'RSION)'#010+
-  'endif'#010+
-  #010+
-  'endif',#010+
-  'endif'#010+
-  'else'#010+
-  'ifdef INSTALL_FPCPACKAGE'#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+
-  'else'#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where the some extra (data)files will be stored'#010+
-  'ifndef INSTALL_DA','TADIR'#010+
-  'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+
-  'endif'#010+
-  #010+
-  'ifndef INSTALL_SHAREDDIR'#010+
-  'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+
-  'endif'#010+
-  #010+
-  '#####################################################################'#010+
-  '# Cross compile dirs'#010+
-  '#############################','#######################################'+
-  '#'#010+
-  #010+
-  'ifdef CROSSCOMPILE'#010+
-  '# Directory where the cross compile tools are stored.'#010+
-  '# First check if they are available in FPCDIR. If no targets/ subdir'#010+
-  '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+
-  'i','fndef CROSSBINDIR'#010+
-  'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+
-  'ifeq ($(CROSSBINDIR),)'#010+
+  'RSION)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'ifdef INSTALL_FPCPACK','AGE'#013#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#013#010+
+  'else'#013#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Where the some extra (data)files will be stored'#013#010+
+  'ifndef INSTALL_DATADIR'#013#010+
+  'INSTALL_DATADIR=$','(INSTALL_BASEDIR)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifndef INSTALL_SHAREDDIR'#013#010+
+  'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Cross compile dirs'#013#010+
+  '###########################################','#########################'+
+  '#'#013#010+
+  #013#010+
+  'ifdef CROSSCOMPILE'#013#010+
+  '# Directory where the cross compile tools are stored.'#013#010+
+  '# First check if they are available in FPCDIR. If no targets/ subdir'#013+
+  #010+
+  '# is found use the targets/ subdir in INSTALL_BASEDIR.'#013#010+
+  'ifndef CR','OSSBINDIR'#013#010+
+  'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#013#010+
+  'ifeq ($(CROSSBINDIR),)'#013#010+
   'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+
-  '(FULL_SOURCE))'#010+
-  'endif'#010+
-  'endif'#010+
-  'else'#010+
-  'CROSSBINDIR='#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[dirlibc]'#010+
-  '# O','n linux, try to find where libgcc.a is.'#010+
-  'ifeq ($(OS_SOURCE),linux)'#010+
-  #010+
-  '# Amd64 to i386?'#010+
-  'ifndef GCCLIBDIR'#010+
-  'ifeq ($(CPU_TARGET),i386)'#010+
-  'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+
-  'ifeq ($(BINUTILSPREFIX),)'#010+
-  'GCCLIBDIR:=$(shell dirname `gcc -m32 -p','rint-libgcc-file-name`)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'ifeq ($(CPU_TARGET),powerpc64)'#010+
-  'ifeq ($(BINUTILSPREFIX),)'#010+
-  'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Try cross gcc'#010+
-  'ifndef GCCLIBDIR'#010+
-  'CROSSGCC=$(strip $(wildcar','d $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+
-  'EEXT),$(SEARCHPATH))))'#010+
-  'ifneq ($(CROSSGCC),)'#010+
-  'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Other libraries from ld.so.conf'#010+
-  'ifndef OTHERLIBDIR'#010+
-  'OTHERLIBDIR:=$(shell g','rep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+
-  '" "; print $1 }'#039')'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'ifdef inUnix'#010+
-  'ifeq ($(OS_SOURCE),netbsd)'#010+
-  'OTHERLIBDIR+=/usr/pkg/lib'#010+
-  'endif'#010+
-  'export GCCLIBDIR OTHERLIB'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[extensions]'#010+
-  '################################################','####################'+
-  '#'#010+
-  '# Default extensions'#010+
-  '#####################################################################'#010+
-  #010+
-  '# Default needed extensions (Go32v2,Linux)'#010+
-  'BATCHEXT=.bat'#010+
-  'LOADEREXT=.as'#010+
-  'EXEEXT=.exe'#010+
-  'PPLEXT=.ppl'#010+
-  'PPUEXT=.ppu'#010+
-  'OEXT=.o'#010+
-  'ASMEXT=.s'#010+
-  'S','MARTEXT=.sl'#010+
-  'STATICLIBEXT=.a'#010+
-  'SHAREDLIBEXT=.so'#010+
-  'SHAREDLIBPREFIX=libfp'#010+
-  'STATICLIBPREFIX=libp'#010+
-  'IMPORTLIBPREFIX=libimp'#010+
-  'RSTEXT=.rst'#010+
-  '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+
-  ' has this'#010+
-  #010+
-  '# 1.0.x has target specific extensio','ns for ppu files and objects'#010+
-  'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+
-  '# short version for 1.1 and above - no target specific extensions'#010+
-  #010+
-  '# Go32v1'#010+
-  'ifeq ($(OS_TARGET),go32v1)'#010+
-  'STATICLIBPREFIX='#010+
-  'SHORTSUFFIX=v1'#010+
-  'endif'#010+
-  #010+
-  '# Go32v2'#010+
-  'ifeq ($(OS_TARGET)',',go32v2)'#010+
-  'STATICLIBPREFIX='#010+
-  'SHORTSUFFIX=dos'#010+
-  'IMPORTLIBPREFIX='#010+
-  'endif'#010+
-  #010+
-  '# watcom'#010+
-  'ifeq ($(OS_TARGET),watcom)'#010+
-  'STATICLIBPREFIX='#010+
-  'OEXT=.obj'#010+
-  'ASMEXT=.asm'#010+
-  'SHAREDLIBEXT=.dll'#010+
-  'SHORTSUFFIX=wat'#010+
-  'IMPORTLIBPREFIX='#010+
-  'endif'#010+
-  #010+
-  '# Linux'#010+
-  'ifeq ($(OS_TARGET),linux)'#010+
-  'BATCHEX','T=.sh'#010+
-  'EXEEXT='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=lnx'#010+
-  'endif'#010+
-  #010+
-  '# FreeBSD'#010+
-  'ifeq ($(OS_TARGET),freebsd)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=fbs'#010+
-  'endif'#010+
-  #010+
-  '# NetBSD'#010+
-  'ifeq ($(OS_TARGET),netbsd)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=nbs'#010+
-  'end','if'#010+
-  #010+
-  '# OpenBSD'#010+
-  'ifeq ($(OS_TARGET),openbsd)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=obs'#010+
-  'endif'#010+
-  #010+
-  '# Win32'#010+
-  'ifeq ($(OS_TARGET),win32)'#010+
-  'SHAREDLIBEXT=.dll'#010+
-  'SHORTSUFFIX=w32'#010+
-  'endif'#010+
-  #010+
-  '# OS/2'#010+
-  'ifeq ($(OS_TARGET),os2)'#010+
-  'BATCHEXT=.cmd'#010+
-  'AOUTEXT=.out'#010+
-  'STATIC','LIBPREFIX='#010+
-  'SHAREDLIBEXT=.dll'#010+
-  'SHORTSUFFIX=os2'#010+
-  'ECHO=echo'#010+
-  'IMPORTLIBPREFIX='#010+
-  'endif'#010+
-  #010+
-  '# EMX'#010+
-  'ifeq ($(OS_TARGET),emx)'#010+
-  'BATCHEXT=.cmd'#010+
-  'AOUTEXT=.out'#010+
-  'STATICLIBPREFIX='#010+
-  'SHAREDLIBEXT=.dll'#010+
-  'SHORTSUFFIX=emx'#010+
-  'ECHO=echo'#010+
-  'IMPORTLIBPREFIX='#010+
-  'endif'#010+
-  #010+
-  '# Amiga'#010+
-  'ifeq ($(OS_','TARGET),amiga)'#010+
-  'EXEEXT='#010+
-  'SHAREDLIBEXT=.library'#010+
-  'SHORTSUFFIX=amg'#010+
-  'endif'#010+
-  #010+
-  '# MorphOS'#010+
-  'ifeq ($(OS_TARGET),morphos)'#010+
-  'EXEEXT='#010+
-  'SHAREDLIBEXT=.library'#010+
-  'SHORTSUFFIX=mos'#010+
-  'endif'#010+
-  #010+
-  '# Atari'#010+
-  'ifeq ($(OS_TARGET),atari)'#010+
-  'EXEEXT=.ttp'#010+
-  'SHORTSUFFIX=ata'#010+
-  'endif'#010+
-  #010+
-  '# BeOS'#010+
-  'ifeq ','($(OS_TARGET),beos)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'SHORTSUFFIX=be'#010+
-  'endif'#010+
-  #010+
-  '# Haiku'#010+
-  'ifeq ($(OS_TARGET),haiku)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'SHORTSUFFIX=hai'#010+
-  'endif'#010+
-  #010+
-  '# Solaris'#010+
-  'ifeq ($(OS_TARGET),solaris)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'SHORTSUFFIX=sun'#010+
-  'endif'#010+
-  #010+
-  '# QNX'#010+
-  'ifeq ($(OS_','TARGET),qnx)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'SHORTSUFFIX=qnx'#010+
-  'endif'#010+
-  #010+
-  '# Netware clib'#010+
-  'ifeq ($(OS_TARGET),netware)'#010+
-  'EXEEXT=.nlm'#010+
-  'STATICLIBPREFIX='#010+
-  'SHORTSUFFIX=nw'#010+
-  'IMPORTLIBPREFIX=imp'#010+
-  'endif'#010+
-  #010+
-  '# Netware libc'#010+
-  'ifeq ($(OS_TARGET),netwlibc)'#010+
-  'EXEEXT=.nlm'#010+
-  'STATICLIBPREF','IX='#010+
-  'SHORTSUFFIX=nwl'#010+
-  'IMPORTLIBPREFIX=imp'#010+
-  'endif'#010+
-  #010+
-  '# MacOS'#010+
-  'ifeq ($(OS_TARGET),macos)'#010+
-  'BATCHEXT='#010+
-  'EXEEXT='#010+
-  'DEBUGSYMEXT=.xcoff'#010+
-  'SHORTSUFFIX=mac'#010+
-  'IMPORTLIBPREFIX=imp'#010+
-  'endif'#010+
-  #010+
-  '# Darwin'#010+
-  'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEE','XT='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=dwn'#010+
-  'endif'#010+
-  #010+
-  '# gba'#010+
-  'ifeq ($(OS_TARGET),gba)'#010+
-  'EXEEXT=.gba'#010+
-  'SHAREDLIBEXT=.so'#010+
-  'SHORTSUFFIX=gba'#010+
-  'endif'#010+
-  #010+
-  '# Symbian OS'#010+
-  'ifeq ($(OS_TARGET),symbian)'#010+
-  'SHAREDLIBEXT=.dll'#010+
-  'SHORTSUFFIX=symbian'#010+
-  'endif'#010+
-  #010+
-  '# NativeNT'#010+
-  'ifeq ($(OS_TARGET),','NativeNT)'#010+
-  'SHAREDLIBEXT=.dll'#010+
-  'SHORTSUFFIX=nativent'#010+
-  'endif'#010+
-  #010+
-  'else'#010+
-  '# long version for 1.0.x - target specific extensions'#010+
-  #010+
-  '# Go32v1'#010+
-  'ifeq ($(OS_TARGET),go32v1)'#010+
-  'PPUEXT=.pp1'#010+
-  'OEXT=.o1'#010+
-  'ASMEXT=.s1'#010+
-  'SMARTEXT=.sl1'#010+
-  'STATICLIBEXT=.a1'#010+
-  'SHAREDLIBEXT=.so1'#010+
-  'STATICL','IBPREFIX='#010+
-  'SHORTSUFFIX=v1'#010+
-  'IMPORTLIBPREFIX='#010+
-  'endif'#010+
-  #010+
-  '# Go32v2'#010+
-  'ifeq ($(OS_TARGET),go32v2)'#010+
-  'STATICLIBPREFIX='#010+
-  'SHORTSUFFIX=dos'#010+
-  'IMPORTLIBPREFIX='#010+
-  'endif'#010+
-  #010+
-  '# watcom'#010+
-  'ifeq ($(OS_TARGET),watcom)'#010+
-  'STATICLIBPREFIX='#010+
-  'SHORTSUFFIX=wat'#010+
-  'IMPORTLIBPREFIX='#010+
-  'endif'#010+
-  #010+
-  '# Lin','ux'#010+
-  'ifeq ($(OS_TARGET),linux)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=lnx'#010+
-  'endif'#010+
-  #010+
-  '# FreeBSD'#010+
-  'ifeq ($(OS_TARGET),freebsd)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=fbs'#010+
-  'endif'#010+
-  #010+
-  '# NetBSD'#010+
-  'ifeq ($(OS_TARGET),netbsd)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT','='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=nbs'#010+
-  'endif'#010+
-  #010+
-  '# OpenBSD'#010+
-  'ifeq ($(OS_TARGET),openbsd)'#010+
-  'BATCHEXT=.sh'#010+
-  'EXEEXT='#010+
-  'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=obs'#010+
-  'endif'#010+
-  #010+
-  '# Win32'#010+
-  'ifeq ($(OS_TARGET),win32)'#010+
-  'PPUEXT=.ppw'#010+
-  'OEXT=.ow'#010+
-  'ASMEXT=.sw'#010+
-  'SMARTEXT=.slw'#010+
-  'STATICLIBEXT=.aw'#010+
-  'SHARED','LIBEXT=.dll'#010+
-  'SHORTSUFFIX=w32'#010+
-  'endif'#010+
-  #010+
-  '# OS/2'#010+
-  'ifeq ($(OS_TARGET),os2)'#010+
-  'BATCHEXT=.cmd'#010+
-  'PPUEXT=.ppo'#010+
-  'ASMEXT=.so2'#010+
-  'OEXT=.oo2'#010+
-  'AOUTEXT=.out'#010+
-  'SMARTEXT=.sl2'#010+
-  'STATICLIBPREFIX='#010+
-  'STATICLIBEXT=.ao2'#010+
-  'SHAREDLIBEXT=.dll'#010+
-  'SHORTSUFFIX=os2'#010+
-  'ECHO=echo'#010+
-  'IMPORTLIBPREFIX='#010+
-  'end','if'#010+
-  #010+
-  '# Amiga'#010+
-  'ifeq ($(OS_TARGET),amiga)'#010+
-  'EXEEXT='#010+
-  'PPUEXT=.ppu'#010+
-  'ASMEXT=.s'#010+
-  'OEXT=.o'#010+
-  'SMARTEXT=.sl'#010+
-  'STATICLIBEXT=.a'#010+
-  'SHAREDLIBEXT=.library'#010+
-  'SHORTSUFFIX=amg'#010+
-  'endif'#010+
-  #010+
-  '# Atari'#010+
-  'ifeq ($(OS_TARGET),atari)'#010+
-  'PPUEXT=.ppu'#010+
-  'ASMEXT=.s'#010+
-  'OEXT=.o'#010+
-  'SMARTEXT=.sl'#010+
-  'STATICLIBEXT=','.a'#010+
-  'EXEEXT=.ttp'#010+
-  'SHORTSUFFIX=ata'#010+
-  'endif'#010+
-  #010+
-  '# BeOS'#010+
-  'ifeq ($(OS_TARGET),beos)'#010+
-  'BATCHEXT=.sh'#010+
-  'PPUEXT=.ppu'#010+
-  'ASMEXT=.s'#010+
-  'OEXT=.o'#010+
-  'SMARTEXT=.sl'#010+
-  'STATICLIBEXT=.a'#010+
-  'EXEEXT='#010+
-  'SHORTSUFFIX=be'#010+
-  'endif'#010+
-  #010+
-  '# Solaris'#010+
-  'ifeq ($(OS_TARGET),solaris)'#010+
-  'BATCHEXT=.sh'#010+
-  'PPUEXT=.ppu'#010+
-  'ASMEX','T=.s'#010+
-  'OEXT=.o'#010+
-  'SMARTEXT=.sl'#010+
-  'STATICLIBEXT=.a'#010+
-  'EXEEXT='#010+
-  'SHORTSUFFIX=sun'#010+
-  'endif'#010+
-  #010+
-  '# QNX'#010+
-  'ifeq ($(OS_TARGET),qnx)'#010+
-  'BATCHEXT=.sh'#010+
-  'PPUEXT=.ppu'#010+
-  'ASMEXT=.s'#010+
-  'OEXT=.o'#010+
-  'SMARTEXT=.sl'#010+
-  'STATICLIBEXT=.a'#010+
-  'EXEEXT='#010+
-  'SHORTSUFFIX=qnx'#010+
-  'endif'#010+
-  #010+
-  '# Netware'#010+
-  'ifeq ($(OS_TARGET),netwa','re)'#010+
-  'STATICLIBPREFIX='#010+
-  'PPUEXT=.ppu'#010+
-  'OEXT=.o'#010+
-  'ASMEXT=.s'#010+
-  'SMARTEXT=.sl'#010+
-  'STATICLIBEXT=.a'#010+
-  'SHAREDLIBEXT=.nlm'#010+
-  'EXEEXT=.nlm'#010+
-  'SHORTSUFFIX=nw'#010+
-  'IMPORTLIBPREFIX=imp'#010+
-  'endif'#010+
-  #010+
-  '# Netware libc'#010+
-  'ifeq ($(OS_TARGET),netwlibc)'#010+
-  'STATICLIBPREFIX='#010+
-  'PPUEXT=.ppu'#010+
-  'OEXT=.o'#010+
-  'ASMEXT=','.s'#010+
-  'SMARTEXT=.sl'#010+
-  'STATICLIBEXT=.a'#010+
-  'SHAREDLIBEXT=.nlm'#010+
-  'EXEEXT=.nlm'#010+
-  'SHORTSUFFIX=nwl'#010+
-  'IMPORTLIBPREFIX=imp'#010+
-  'endif'#010+
-  #010+
-  '# MacOS'#010+
-  'ifeq ($(OS_TARGET),macos)'#010+
-  'BATCHEXT='#010+
-  'PPUEXT=.ppu'#010+
-  'ASMEXT=.s'#010+
-  'OEXT=.o'#010+
-  'SMARTEXT=.sl'#010+
-  'STATICLIBEXT=.a'#010+
-  'EXEEXT='#010+
-  'DEBUGSYMEXT=.xcoff'#010+
-  'SHORT','SUFFIX=mac'#010+
-  'IMPORTLIBPREFIX=imp'#010+
-  'endif'#010+
-  #010+
-  '#end of target specific settings'#010+
-  'endif'#010+
-  #010+
-  '# For 8.3 limited OS'#039's the short suffixes'#010+
-  '# Otherwise use the full source/target names'#010+
-  'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+
-  'FPCMADE=fpcmade.$(SHORTSUF','FIX)'#010+
-  'ZIPSUFFIX=$(SHORTSUFFIX)'#010+
-  'ZIPCROSSPREFIX='#010+
-  'ZIPSOURCESUFFIX=src'#010+
-  'ZIPEXAMPLESUFFIX=exm'#010+
-  'else'#010+
-  'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+
-  'ZIPSOURCESUFFIX=.source'#010+
-  'ZIPEXAMPLESUFFIX=.examples'#010+
-  'ifdef CROSSCOMPILE'#010+
-  'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+
-  'ZIPCROSSPREFIX=$(TA','RGETSUFFIX)-'#010+
-  'else'#010+
-  'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+
-  'ZIPCROSSPREFIX='#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '[defaulttools]'#010+
-  '#####################################################################'#010+
-  '# Default Tools'#010+
-  '#################################################################','###'+
-  '#'#010+
-  #010+
-  '# Names of the binutils tools'#010+
-  'ASNAME=$(BINUTILSPREFIX)as'#010+
-  'LDNAME=$(BINUTILSPREFIX)ld'#010+
-  'ARNAME=$(BINUTILSPREFIX)ar'#010+
-  'RCNAME=$(BINUTILSPREFIX)rc'#010+
-  'ifneq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+
-  'ifeq ($(OS_TARGET),win32)'#010+
-  'ifeq ($(CROSSBINDIR),)'#010+
-  'ASNA','ME=asw'#010+
-  'LDNAME=ldw'#010+
-  'ARNAME=arw'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# assembler, redefine it if cross compiling'#010+
-  'ifndef ASPROG'#010+
-  'ifdef CROSSBINDIR'#010+
-  'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+
-  'else'#010+
-  'ASPROG=$(ASNAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# linker, but probably not used'#010+
-  'ifnde','f LDPROG'#010+
-  'ifdef CROSSBINDIR'#010+
-  'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+
-  'else'#010+
-  'LDPROG=$(LDNAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Resource compiler'#010+
-  'ifndef RCPROG'#010+
-  'ifdef CROSSBINDIR'#010+
-  'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+
-  'else'#010+
-  'RCPROG=$(RCNAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# A','rchiver'#010+
-  'ifndef ARPROG'#010+
-  'ifdef CROSSBINDIR'#010+
-  'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+
-  'else'#010+
-  'ARPROG=$(ARNAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Override defaults'#010+
-  'AS=$(ASPROG)'#010+
-  'LD=$(LDPROG)'#010+
-  'RC=$(RCPROG)'#010+
-  'AR=$(ARPROG)'#010+
-  #010+
-  '# ppas.bat / ppas.sh'#010+
-  'PPAS=ppas$(SRCBATCHEXT)'#010+
-  #010+
-  '# ','ldconfig to rebuild .so cache'#010+
-  'ifdef inUnix'#010+
-  'LDCONFIG=ldconfig'#010+
-  'else'#010+
-  'LDCONFIG='#010+
-  'endif'#010+
-  #010+
-  'ifdef DATE'#010+
-  'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+
-  'else'#010+
-  'DATESTR='#010+
-  'endif'#010+
-  #010+
+  '(FULL_SOURCE))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'CROSSBINDIR='#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[dirlibc]'#013,#010+
+  '# On linux, try to find where libgcc.a is.'#013#010+
+  'ifeq ($(OS_SOURCE),linux)'#013#010+
+  #013#010+
+  '# Amd64 to i386?'#013#010+
+  'ifndef GCCLIBDIR'#013#010+
+  'ifeq ($(CPU_TARGET),i386)'#013#010+
+  'ifneq ($(findstring x86_64,$(shell uname -a)),)'#013#010+
+  'ifeq ($(BINUTILSPREFIX),)'#013#010+
+  'GCCLIBDIR:=$(shell dirname ','`gcc -m32 -print-libgcc-file-name`)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'ifeq ($(CPU_TARGET),powerpc64)'#013#010+
+  'ifeq ($(BINUTILSPREFIX),)'#013#010+
+  'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Try cross gcc'#013#010+
+  'ifndef GCCLIBDIR'#013#010+
+  'C','ROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+
+  'EEXT),$(SEARCHPATH))))'#013#010+
+  'ifneq ($(CROSSGCC),)'#013#010+
+  'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Other libraries from ld.so.conf'#013#010+
+  'ifndef OT','HERLIBDIR'#013#010+
+  'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+
+  '"; print $1 }'#039')'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef inUnix'#013#010+
+  'ifeq ($(OS_SOURCE),netbsd)'#013#010+
+  'OTHERLIBDIR+=/usr/pkg/lib'#013#010+
+  'endif'#013#010+
+  'export GCCLIBDIR OTHERLIB'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[extensions]'#013#010+
+  '##','##################################################################'+
+  '#'#013#010+
+  '# Default extensions'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# Default needed extensions (Go32v2,Linux)'#013#010+
+  'BATCHEXT=.bat'#013#010+
+  'LOADEREXT=.as'#013#010+
+  'EX','EEXT=.exe'#013#010+
+  'PPLEXT=.ppl'#013#010+
+  'PPUEXT=.ppu'#013#010+
+  'OEXT=.o'#013#010+
+  'ASMEXT=.s'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'STATICLIBEXT=.a'#013#010+
+  'SHAREDLIBEXT=.so'#013#010+
+  'SHAREDLIBPREFIX=libfp'#013#010+
+  'STATICLIBPREFIX=libp'#013#010+
+  'IMPORTLIBPREFIX=libimp'#013#010+
+  'RSTEXT=.rst'#013#010+
+  '#DEBUGSYMEXT #for debugger symbol files, define only',' for targets whi'+
+  'ch has this'#013#010+
+  #013#010+
+  '# 1.0.x has target specific extensions for ppu files and objects'#013#010+
+  'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#013#010+
+  '# short version for 1.1 and above - no target specific extensions'#013#010+
+  #013#010+
+  '# Go32v1'#013#010+
+  'ifeq ($(OS_TARGET),go','32v1)'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHORTSUFFIX=v1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Go32v2'#013#010+
+  'ifeq ($(OS_TARGET),go32v2)'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHORTSUFFIX=dos'#013#010+
+  'IMPORTLIBPREFIX='#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# watcom'#013#010+
+  'ifeq ($(OS_TARGET),watcom)'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'OEXT=.obj'#013#010+
+  'ASMEXT=.asm'#013#010+
+  'SHAREDLIBE','XT=.dll'#013#010+
+  'SHORTSUFFIX=wat'#013#010+
+  'IMPORTLIBPREFIX='#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Linux'#013#010+
+  'ifeq ($(OS_TARGET),linux)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'SHORTSUFFIX=lnx'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# FreeBSD'#013#010+
+  'ifeq ($(OS_TARGET),freebsd)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'SHORTSU','FFIX=fbs'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# NetBSD'#013#010+
+  'ifeq ($(OS_TARGET),netbsd)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'SHORTSUFFIX=nbs'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# OpenBSD'#013#010+
+  'ifeq ($(OS_TARGET),openbsd)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'SHORTSUFFIX=obs'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Win32'#013#010+
+  'ifeq',' ($(OS_TARGET),win32)'#013#010+
+  'SHAREDLIBEXT=.dll'#013#010+
+  'SHORTSUFFIX=w32'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# OS/2'#013#010+
+  'ifeq ($(OS_TARGET),os2)'#013#010+
+  'BATCHEXT=.cmd'#013#010+
+  'AOUTEXT=.out'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHAREDLIBEXT=.dll'#013#010+
+  'SHORTSUFFIX=os2'#013#010+
+  'ECHO=echo'#013#010+
+  'IMPORTLIBPREFIX='#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# EMX'#013#010+
+  'ifeq ($(OS_','TARGET),emx)'#013#010+
+  'BATCHEXT=.cmd'#013#010+
+  'AOUTEXT=.out'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHAREDLIBEXT=.dll'#013#010+
+  'SHORTSUFFIX=emx'#013#010+
+  'ECHO=echo'#013#010+
+  'IMPORTLIBPREFIX='#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Amiga'#013#010+
+  'ifeq ($(OS_TARGET),amiga)'#013#010+
+  'EXEEXT='#013#010+
+  'SHAREDLIBEXT=.library'#013#010+
+  'SHORTSUFFIX=amg'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# MorphOS'#013#010,
+  'ifeq ($(OS_TARGET),morphos)'#013#010+
+  'EXEEXT='#013#010+
+  'SHAREDLIBEXT=.library'#013#010+
+  'SHORTSUFFIX=mos'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Atari'#013#010+
+  'ifeq ($(OS_TARGET),atari)'#013#010+
+  'EXEEXT=.ttp'#013#010+
+  'SHORTSUFFIX=ata'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# BeOS'#013#010+
+  'ifeq ($(OS_TARGET),beos)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'SHORTSUFFIX=be'#013#010+
+  'endif',#013#010+
+  #013#010+
+  '# Haiku'#013#010+
+  'ifeq ($(OS_TARGET),haiku)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'SHORTSUFFIX=hai'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Solaris'#013#010+
+  'ifeq ($(OS_TARGET),solaris)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'SHORTSUFFIX=sun'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# QNX'#013#010+
+  'ifeq ($(OS_TARGET),qnx)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'SHORTSU','FFIX=qnx'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Netware clib'#013#010+
+  'ifeq ($(OS_TARGET),netware)'#013#010+
+  'EXEEXT=.nlm'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHORTSUFFIX=nw'#013#010+
+  'IMPORTLIBPREFIX=imp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Netware libc'#013#010+
+  'ifeq ($(OS_TARGET),netwlibc)'#013#010+
+  'EXEEXT=.nlm'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHORTSUFFIX=nwl'#013#010+
+  'IMPOR','TLIBPREFIX=imp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# MacOS'#013#010+
+  'ifeq ($(OS_TARGET),macos)'#013#010+
+  'BATCHEXT='#013#010+
+  'EXEEXT='#013#010+
+  'DEBUGSYMEXT=.xcoff'#013#010+
+  'SHORTSUFFIX=mac'#013#010+
+  'IMPORTLIBPREFIX=imp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Darwin'#013#010+
+  'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSH','AREDLIB=1'#013#010+
+  'SHORTSUFFIX=dwn'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# gba'#013#010+
+  'ifeq ($(OS_TARGET),gba)'#013#010+
+  'EXEEXT=.gba'#013#010+
+  'SHAREDLIBEXT=.so'#013#010+
+  'SHORTSUFFIX=gba'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Symbian OS'#013#010+
+  'ifeq ($(OS_TARGET),symbian)'#013#010+
+  'SHAREDLIBEXT=.dll'#013#010+
+  'SHORTSUFFIX=symbian'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# NativeNT'#013#010+
+  'ifeq ($(OS','_TARGET),NativeNT)'#013#010+
+  'SHAREDLIBEXT=.dll'#013#010+
+  'SHORTSUFFIX=nativent'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# wii'#013#010+
+  'ifeq ($(OS_TARGET),wii)'#013#010+
+  'EXEEXT=.dol'#013#010+
+  'SHAREDLIBEXT=.so'#013#010+
+  'SHORTSUFFIX=wii'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'else'#013#010+
+  '# long version for 1.0.x - target specific extensions'#013#010+
+  #013#010+
+  '# Go32v1'#013#010+
+  'ifeq ($(','OS_TARGET),go32v1)'#013#010+
+  'PPUEXT=.pp1'#013#010+
+  'OEXT=.o1'#013#010+
+  'ASMEXT=.s1'#013#010+
+  'SMARTEXT=.sl1'#013#010+
+  'STATICLIBEXT=.a1'#013#010+
+  'SHAREDLIBEXT=.so1'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHORTSUFFIX=v1'#013#010+
+  'IMPORTLIBPREFIX='#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Go32v2'#013#010+
+  'ifeq ($(OS_TARGET),go32v2)'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHORTSUFFIX=dos'#013,#010+
+  'IMPORTLIBPREFIX='#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# watcom'#013#010+
+  'ifeq ($(OS_TARGET),watcom)'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'SHORTSUFFIX=wat'#013#010+
+  'IMPORTLIBPREFIX='#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Linux'#013#010+
+  'ifeq ($(OS_TARGET),linux)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'SHORTSUFFIX=lnx'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# FreeBSD'#013#010,
+  'ifeq ($(OS_TARGET),freebsd)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'SHORTSUFFIX=fbs'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# NetBSD'#013#010+
+  'ifeq ($(OS_TARGET),netbsd)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'SHORTSUFFIX=nbs'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# OpenBSD'#013#010+
+  'ifeq ($(OS_TARGET),openbsd)'#013#010+
+  'BAT','CHEXT=.sh'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'SHORTSUFFIX=obs'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Win32'#013#010+
+  'ifeq ($(OS_TARGET),win32)'#013#010+
+  'PPUEXT=.ppw'#013#010+
+  'OEXT=.ow'#013#010+
+  'ASMEXT=.sw'#013#010+
+  'SMARTEXT=.slw'#013#010+
+  'STATICLIBEXT=.aw'#013#010+
+  'SHAREDLIBEXT=.dll'#013#010+
+  'SHORTSUFFIX=w32'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# OS/2'#013#010+
+  'ifeq ($(OS_TARGET),os','2)'#013#010+
+  'BATCHEXT=.cmd'#013#010+
+  'PPUEXT=.ppo'#013#010+
+  'ASMEXT=.so2'#013#010+
+  'OEXT=.oo2'#013#010+
+  'AOUTEXT=.out'#013#010+
+  'SMARTEXT=.sl2'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'STATICLIBEXT=.ao2'#013#010+
+  'SHAREDLIBEXT=.dll'#013#010+
+  'SHORTSUFFIX=os2'#013#010+
+  'ECHO=echo'#013#010+
+  'IMPORTLIBPREFIX='#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Amiga'#013#010+
+  'ifeq ($(OS_TARGET),amiga)'#013#010+
+  'EXEEXT='#013,#010+
+  'PPUEXT=.ppu'#013#010+
+  'ASMEXT=.s'#013#010+
+  'OEXT=.o'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'STATICLIBEXT=.a'#013#010+
+  'SHAREDLIBEXT=.library'#013#010+
+  'SHORTSUFFIX=amg'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Atari'#013#010+
+  'ifeq ($(OS_TARGET),atari)'#013#010+
+  'PPUEXT=.ppu'#013#010+
+  'ASMEXT=.s'#013#010+
+  'OEXT=.o'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'STATICLIBEXT=.a'#013#010+
+  'EXEEXT=.ttp'#013#010+
+  'SHORTSUFFIX=a','ta'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# BeOS'#013#010+
+  'ifeq ($(OS_TARGET),beos)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'PPUEXT=.ppu'#013#010+
+  'ASMEXT=.s'#013#010+
+  'OEXT=.o'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'STATICLIBEXT=.a'#013#010+
+  'EXEEXT='#013#010+
+  'SHORTSUFFIX=be'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Solaris'#013#010+
+  'ifeq ($(OS_TARGET),solaris)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'PPUEXT=.ppu'#013#010+
+  'ASMEXT=.s'#013#010+
+  'OEX','T=.o'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'STATICLIBEXT=.a'#013#010+
+  'EXEEXT='#013#010+
+  'SHORTSUFFIX=sun'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# QNX'#013#010+
+  'ifeq ($(OS_TARGET),qnx)'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'PPUEXT=.ppu'#013#010+
+  'ASMEXT=.s'#013#010+
+  'OEXT=.o'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'STATICLIBEXT=.a'#013#010+
+  'EXEEXT='#013#010+
+  'SHORTSUFFIX=qnx'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Netware'#013#010+
+  'ifeq ($(OS_T','ARGET),netware)'#013#010+
+  'STATICLIBPREFIX='#013#010+
+  'PPUEXT=.ppu'#013#010+
+  'OEXT=.o'#013#010+
+  'ASMEXT=.s'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'STATICLIBEXT=.a'#013#010+
+  'SHAREDLIBEXT=.nlm'#013#010+
+  'EXEEXT=.nlm'#013#010+
+  'SHORTSUFFIX=nw'#013#010+
+  'IMPORTLIBPREFIX=imp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Netware libc'#013#010+
+  'ifeq ($(OS_TARGET),netwlibc)'#013#010+
+  'STATICLIBPREFIX='#013,#010+
+  'PPUEXT=.ppu'#013#010+
+  'OEXT=.o'#013#010+
+  'ASMEXT=.s'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'STATICLIBEXT=.a'#013#010+
+  'SHAREDLIBEXT=.nlm'#013#010+
+  'EXEEXT=.nlm'#013#010+
+  'SHORTSUFFIX=nwl'#013#010+
+  'IMPORTLIBPREFIX=imp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# MacOS'#013#010+
+  'ifeq ($(OS_TARGET),macos)'#013#010+
+  'BATCHEXT='#013#010+
+  'PPUEXT=.ppu'#013#010+
+  'ASMEXT=.s'#013#010+
+  'OEXT=.o'#013#010+
+  'SMARTEXT=.sl'#013#010+
+  'ST','ATICLIBEXT=.a'#013#010+
+  'EXEEXT='#013#010+
+  'DEBUGSYMEXT=.xcoff'#013#010+
+  'SHORTSUFFIX=mac'#013#010+
+  'IMPORTLIBPREFIX=imp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '#end of target specific settings'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# For 8.3 limited OS'#039's the short suffixes'#013#010+
+  '# Otherwise use the full source/target names'#013#010+
+  'ifneq ($(findstri','ng $(OS_SOURCE),$(LIMIT83fs)),)'#013#010+
+  'FPCMADE=fpcmade.$(SHORTSUFFIX)'#013#010+
+  'ZIPSUFFIX=$(SHORTSUFFIX)'#013#010+
+  'ZIPCROSSPREFIX='#013#010+
+  'ZIPSOURCESUFFIX=src'#013#010+
+  'ZIPEXAMPLESUFFIX=exm'#013#010+
+  'else'#013#010+
+  'FPCMADE=fpcmade.$(TARGETSUFFIX)'#013#010+
+  'ZIPSOURCESUFFIX=.source'#013#010+
+  'ZIPEXAMPLESUFFIX=.example','s'#013#010+
+  'ifdef CROSSCOMPILE'#013#010+
+  'ZIPSUFFIX=.$(SOURCESUFFIX)'#013#010+
+  'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#013#010+
+  'else'#013#010+
+  'ZIPSUFFIX=.$(TARGETSUFFIX)'#013#010+
+  'ZIPCROSSPREFIX='#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '[defaulttools]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# ','Default Tools'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# Names of the binutils tools'#013#010+
+  'ASNAME=$(BINUTILSPREFIX)as'#013#010+
+  'LDNAME=$(BINUTILSPREFIX)ld'#013#010+
+  'ARNAME=$(BINUTILSPREFIX)ar'#013#010+
+  'RCNAME=$(BINUTILSPREFIX)rc'#013#010+
+  'ifneq ($(','findstring 1.0.,$(FPC_VERSION)),)'#013#010+
+  'ifeq ($(OS_TARGET),win32)'#013#010+
+  'ifeq ($(CROSSBINDIR),)'#013#010+
+  'ASNAME=asw'#013#010+
+  'LDNAME=ldw'#013#010+
+  'ARNAME=arw'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# assembler, redefine it if cross compiling'#013#010+
+  'ifndef ASPROG'#013#010+
+  'ifdef CROSSBINDIR'#013#010+
+  'ASPROG=$(CROSSBI','NDIR)/$(ASNAME)$(SRCEXEEXT)'#013#010+
+  'else'#013#010+
+  'ASPROG=$(ASNAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# linker, but probably not used'#013#010+
+  'ifndef LDPROG'#013#010+
+  'ifdef CROSSBINDIR'#013#010+
+  'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#013#010+
+  'else'#013#010+
+  'LDPROG=$(LDNAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Resource compiler',#013#010+
+  'ifndef RCPROG'#013#010+
+  'ifdef CROSSBINDIR'#013#010+
+  'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#013#010+
+  'else'#013#010+
+  'RCPROG=$(RCNAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Archiver'#013#010+
+  'ifndef ARPROG'#013#010+
+  'ifdef CROSSBINDIR'#013#010+
+  'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#013#010+
+  'else'#013#010+
+  'ARPROG=$(ARNAME)'#013#010+
+  'endi','f'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Override defaults'#013#010+
+  'AS=$(ASPROG)'#013#010+
+  'LD=$(LDPROG)'#013#010+
+  'RC=$(RCPROG)'#013#010+
+  'AR=$(ARPROG)'#013#010+
+  #013#010+
+  '# ppas.bat / ppas.sh'#013#010+
+  'PPAS=ppas$(SRCBATCHEXT)'#013#010+
+  #013#010+
+  '# ldconfig to rebuild .so cache'#013#010+
+  'ifdef inUnix'#013#010+
+  'LDCONFIG=ldconfig'#013#010+
+  'else'#013#010+
+  'LDCONFIG='#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef DA','TE'#013#010+
+  'DATESTR:=$(shell $(DATE) +%Y%m%d)'#013#010+
+  'else'#013#010+
+  'DATESTR='#013#010+
+  'endif'#013#010+
+  #013#010+
   '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+
-  'ause'#010+
-  '# upx uses that one ','itself (PFV)'#010+
-  'ifndef UPXPROG'#010+
-  'ifeq ($(OS_TARGET),go32v2)'#010+
-  'UPXPROG:=1'#010+
-  'endif'#010+
-  'ifeq ($(OS_TARGET),win32)'#010+
-  'UPXPROG:=1'#010+
-  'endif'#010+
-  'ifdef UPXPROG'#010+
+  'ause'#013#010+
+  '# upx uses that one itself (PFV)'#013#010+
+  'ifndef UPXPROG'#013#010+
+  'ifeq ($(OS_TARGET),go32v2)'#013#010+
+  'UPXPROG:=1'#013#010+
+  'endif'#013#010+
+  'ifeq ($','(OS_TARGET),win32)'#013#010+
+  'UPXPROG:=1'#013#010+
+  'endif'#013#010+
+  'ifdef UPXPROG'#013#010+
   'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+
-  ')))'#010+
-  'ifeq ($(UPXPROG),)'#010+
-  'UPXPROG='#010+
-  'else'#010+
-  'UPXP','ROG:=$(firstword $(UPXPROG))'#010+
-  'endif'#010+
-  'else'#010+
-  'UPXPROG='#010+
-  'endif'#010+
-  'endif'#010+
-  'export UPXPROG'#010+
-  #010+
-  '# Zip options'#010+
-  'ZIPOPT=-9'#010+
-  'ZIPEXT=.zip'#010+
-  #010+
-  '# Tar options'#010+
-  'ifeq ($(USETAR),bz2)'#010+
-  'TAROPT=vj'#010+
-  'TAREXT=.tar.bz2'#010+
-  'else'#010+
-  'TAROPT=vz'#010+
-  'TAREXT=.tar.gz'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[command_begin]'#010+
+  ')))'#013#010+
+  'ifeq ($(UPXPROG),)'#013#010+
+  'UPXPROG='#013#010+
+  'else'#013#010+
+  'UPXPROG:=$(firstword $(UPXPROG))'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'UPXPROG='#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'expo','rt UPXPROG'#013#010+
+  #013#010+
+  '# Zip options'#013#010+
+  'ZIPOPT=-9'#013#010+
+  'ZIPEXT=.zip'#013#010+
+  #013#010+
+  '# Tar options'#013#010+
+  'ifeq ($(USETAR),bz2)'#013#010+
+  'TAROPT=vj'#013#010+
+  'TAREXT=.tar.bz2'#013#010+
+  'else'#013#010+
+  'TAROPT=vz'#013#010+
+  'TAREXT=.tar.gz'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[command_begin]'#013#010+
+  '###########################################################','#########'+
+  '#'#013#010+
+  '# Compiler Command Line'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#013+
+  #010+
+  '# compiler this needs to be turned off'#013#010+
+  'ifndef NOCPUDEF'#013#010+
+  'over','ride FPCOPTDEF=$(ARCH)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '# Load commandline OPT and add target and unit dir to be sure'#013#010+
+  'ifneq ($(OS_TARGET),$(OS_SOURCE))'#013#010+
+  'override FPCOPT+=-T$(OS_TARGET)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#013#010+
+  'override FPCOPT+=-P$(ARCH)'#013#010,
+  'endif'#013#010+
+  #013#010+
+  'ifeq ($(OS_SOURCE),openbsd)'#013#010+
+  'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifndef CROSSBOOTSTRAP'#013#010+
+  'ifneq ($(BINUTILSPREFIX),)'#013#010+
+  'override FPCOPT+=-XP$(BINUTILSPREFIX)'#013#010+
+  'endif'#013#010+
+  'ifneq ($(BINUTILSPREFIX),)'#013#010+
+  'override FPCOPT+=-Xr$(RLIN','KPATH)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# User dirs should be first, so they are looked at first'#013#010+
+  'ifdef UNITDIR'#013#010+
+  'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#013#010+
+  'endif'#013#010+
+  'ifdef LIBDIR'#013#010+
+  'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#013#010+
+  'endif'#013#010+
+  'ifdef OBJDIR'#013#010+
+  'override F','PCOPT+=$(addprefix -Fo,$(OBJDIR))'#013#010+
+  'endif'#013#010+
+  'ifdef INCDIR'#013#010+
+  'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Smartlinking'#013#010+
+  'ifdef LINKSMART'#013#010+
+  'override FPCOPT+=-XX'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Smartlinking creation'#013#010+
+  'ifdef CREATESMART'#013#010+
+  'override FPCOPT+=-CX'#013#010,
+  'endif'#013#010+
+  #013#010+
+  '# Debug'#013#010+
+  'ifdef DEBUG'#013#010+
+  'override FPCOPT+=-gl'#013#010+
+  'override FPCOPTDEF+=DEBUG'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Release mode'#013#010+
+  '# (strip, optimize and don'#039't load fpc.cfg)'#013#010+
+  '# fpc 2.1 has -O2 for all targets'#013#010+
+  'ifdef RELEASE'#013#010+
+  'ifneq ($(findstring 2.0.,$(FPC_VERSION)),',')'#013#010+
+  'ifeq ($(CPU_TARGET),i386)'#013#010+
+  'FPCCPUOPT:=-OG2p3'#013#010+
+  'endif'#013#010+
+  'ifeq ($(CPU_TARGET),powerpc)'#013#010+
+  'FPCCPUOPT:=-O1r'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'FPCCPUOPT:=-O2'#013#010+
+  'endif'#013#010+
+  'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#013#010+
+  'override FPCOPTDEF+=RELEASE'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Strip'#013#010+
+  'ifdef STRIP'#013,#010+
+  'override FPCOPT+=-Xs'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Optimizer'#013#010+
+  'ifdef OPTIMIZE'#013#010+
+  'override FPCOPT+=-O2'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Verbose settings (warning,note,info)'#013#010+
+  'ifdef VERBOSE'#013#010+
+  'override FPCOPT+=-vwni'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Needed compiler options'#013#010+
+  'ifdef COMPILER_OPTIONS'#013#010+
+  'override ','FPCOPT+=$(COMPILER_OPTIONS)'#013#010+
+  'endif'#013#010+
+  'ifdef COMPILER_UNITDIR'#013#010+
+  'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#013#010+
+  'endif'#013#010+
+  'ifdef COMPILER_LIBRARYDIR'#013#010+
+  'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#013#010+
+  'endif'#013#010+
+  'ifdef COMPILER_OBJECTDIR'#013#010,
+  'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#013#010+
+  'endif'#013#010+
+  'ifdef COMPILER_INCLUDEDIR'#013#010+
+  'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Cross compiler utils'#013#010+
+  'ifdef CROSSBINDIR'#013#010+
+  'override FPCOPT+=-FD$(CROSSBINDIR)'#013#010+
+  'end','if'#013#010+
+  #013#010+
+  '# Target dirs and the prefix to use for clean/install'#013#010+
+  'ifdef COMPILER_TARGETDIR'#013#010+
+  'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#013#010+
+  'ifeq ($(COMPILER_TARGETDIR),.)'#013#010+
+  'override TARGETDIRPREFIX='#013#010+
+  'else'#013#010+
+  'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR',')/'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Unit target dir (default is units/<cpu>-<os>/'#013#010+
+  'ifdef COMPILER_UNITTARGETDIR'#013#010+
+  'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#013#010+
+  'ifeq ($(COMPILER_UNITTARGETDIR),.)'#013#010+
+  'override UNITTARGETDIRPREFIX='#013#010+
+  'else'#013#010+
+  'override UNITTARGETDI','RPREFIX=$(COMPILER_UNITTARGETDIR)/'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'ifdef COMPILER_TARGETDIR'#013#010+
+  'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#013#010+
+  'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef CREATESHARED'#013#010+
+  'override FPCOPT+=-Cg'#013#010+
+  #013#010+
+  'i','feq ($(CPU_TARGET),i386)'#013#010+
+  'override FPCOPT+=-Aas'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'endif'#013#010+
+  #013#010+
+  '# create always pic'#039'ed code on x86_64'#013#010+
+  'ifeq ($(findstring 2.0.,$(FPC_VERSION)),)'#013#010+
+  'ifeq ($(OS_TARGET),linux)'#013#010+
+  'ifeq ($(CPU_TARGET),x86_64)'#013#010+
+  'override FPCOPT+=-Cg'#013#010+
+  'endif'#013#010+
+  'endif'#013,#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef LINKSHARED'#013#010+
+  '#!!! deactived for testing override FPCOPT+=-XD'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[command_libc]'#013#010+
+  '# Add GCC lib path if asked'#013#010+
+  'ifdef GCCLIBDIR'#013#010+
+  'override FPCOPT+=-Fl$(GCCLIBDIR)'#013#010+
+  'endif'#013#010+
+  'ifdef OTHERLIBDIR'#013#010+
+  'override FPCOPT+=$(addprefix -','Fl,$(OTHERLIBDIR))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[command_end]'#013#010+
+  '# Add commandline options last so they can override'#013#010+
+  'ifdef OPT'#013#010+
+  'override FPCOPT+=$(OPT)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Add defines from FPCOPTDEF to FPCOPT'#013#010+
+  'ifdef FPCOPTDEF'#013#010+
+  'override FPCOPT+=$(addprefix -d,$(FPCOP','TDEF))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Was a config file specified ?'#013#010+
+  'ifdef CFGFILE'#013#010+
+  'override FPCOPT+=@$(CFGFILE)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Use the environment to pass commandline options?'#013#010+
+  'ifdef USEENV'#013#010+
+  'override FPCEXTCMD:=$(FPCOPT)'#013#010+
+  'override FPCOPT:=!FPCEXTCMD'#013#010+
+  'export FPC','EXTCMD'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#013#010+
+  'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#013#010+
+  #013#010+
+  'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#013#010+
+  'override ACROSSCOMPILE=1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef ACROSSCOMPILE'#013#010+
+  'override FPCOPT+=$(CROSS','OPT)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Compiler commandline'#013#010+
+  'override COMPILER:=$(FPC) $(FPCOPT)'#013#010+
+  #013#010+
+  '# also call ppas if with command option -s'#013#010+
+  '# but only if the FULL_SOURCE and FULL_TARGET are equal'#013#010+
+  'ifeq (,$(findstring -s ,$(COMPILER)))'#013#010+
+  'EXECPPAS='#013#010+
+  'else'#013#010+
+  'ifeq ','($(FULL_SOURCE),$(FULL_TARGET))'#013#010+
+  'ifdef RUNBATCH'#013#010+
+  'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#013#010+
+  'else'#013#010+
+  'EXECPPAS:=@$(PPAS)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[loaderrules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Loaders'#013#010+
   '###########','#########################################################'+
-  '#'#010+
-  '# Compiler Command Line'#010+
-  '#####################################################################'#010+
-  #010+
-  '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+
-  '# compiler this ne','eds to be turned off'#010+
-  'ifndef NOCPUDEF'#010+
-  'override FPCOPTDEF=$(ARCH)'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '# Load commandline OPT and add target and unit dir to be sure'#010+
-  'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+
-  'override FPCOPT+=-T$(OS_TARGET)'#010+
-  'endif'#010+
-  #010+
-  'ifneq ($(CPU_TARGET),$(CPU_SOURCE','))'#010+
-  'override FPCOPT+=-P$(ARCH)'#010+
-  'endif'#010+
-  #010+
-  'ifeq ($(OS_SOURCE),openbsd)'#010+
-  'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+
-  'endif'#010+
-  #010+
-  'ifndef CROSSBOOTSTRAP'#010+
-  'ifneq ($(BINUTILSPREFIX),)'#010+
-  'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+
-  'endif'#010+
-  'ifneq ($(BINUTILSPREFIX),)'#010+
-  'overrid','e FPCOPT+=-Xr$(RLINKPATH)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# User dirs should be first, so they are looked at first'#010+
-  'ifdef UNITDIR'#010+
-  'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
-  'endif'#010+
-  'ifdef LIBDIR'#010+
-  'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
-  'endif'#010+
-  'ifdef OBJDIR'#010+
-  'ove','rride FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
-  'endif'#010+
-  'ifdef INCDIR'#010+
-  'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
-  'endif'#010+
-  #010+
-  '# Smartlinking'#010+
-  'ifdef LINKSMART'#010+
-  'override FPCOPT+=-XX'#010+
-  'endif'#010+
-  #010+
-  '# Smartlinking creation'#010+
-  'ifdef CREATESMART'#010+
-  'override FPCOPT+=-CX'#010+
-  'endif'#010+
-  #010,
-  '# Debug'#010+
-  'ifdef DEBUG'#010+
-  'override FPCOPT+=-gl'#010+
-  'override FPCOPTDEF+=DEBUG'#010+
-  'endif'#010+
-  #010+
-  '# Release mode'#010+
-  '# (strip, optimize and don'#039't load fpc.cfg)'#010+
-  '# fpc 2.1 has -O2 for all targets'#010+
-  'ifdef RELEASE'#010+
-  'ifneq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+
-  'ifeq ($(CPU_TARGE','T),i386)'#010+
-  'FPCCPUOPT:=-OG2p3'#010+
-  'endif'#010+
-  'ifeq ($(CPU_TARGET),powerpc)'#010+
-  'FPCCPUOPT:=-O1r'#010+
-  'endif'#010+
-  'else'#010+
-  'FPCCPUOPT:=-O2'#010+
-  'endif'#010+
-  'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+
-  'override FPCOPTDEF+=RELEASE'#010+
-  'endif'#010+
-  #010+
-  '# Strip'#010+
-  'ifdef STRIP'#010+
-  'override FPCOPT+=-Xs'#010+
-  'endif'#010+
-  #010+
-  '# Opti','mizer'#010+
-  'ifdef OPTIMIZE'#010+
-  'override FPCOPT+=-O2'#010+
-  'endif'#010+
-  #010+
-  '# Verbose settings (warning,note,info)'#010+
-  'ifdef VERBOSE'#010+
-  'override FPCOPT+=-vwni'#010+
-  'endif'#010+
-  #010+
-  '# Needed compiler options'#010+
-  'ifdef COMPILER_OPTIONS'#010+
-  'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
-  'endif'#010+
-  'ifdef COMPILER_U','NITDIR'#010+
-  'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
-  'endif'#010+
-  'ifdef COMPILER_LIBRARYDIR'#010+
-  'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
-  'endif'#010+
-  'ifdef COMPILER_OBJECTDIR'#010+
-  'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
-  'end','if'#010+
-  'ifdef COMPILER_INCLUDEDIR'#010+
-  'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
-  'endif'#010+
-  #010+
-  '# Cross compiler utils'#010+
-  'ifdef CROSSBINDIR'#010+
-  'override FPCOPT+=-FD$(CROSSBINDIR)'#010+
-  'endif'#010+
-  #010+
-  '# Target dirs and the prefix to use for clean/install'#010+
-  'ifdef COMP','ILER_TARGETDIR'#010+
-  'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
-  'ifeq ($(COMPILER_TARGETDIR),.)'#010+
-  'override TARGETDIRPREFIX='#010+
-  'else'#010+
-  'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Unit target dir (default is units/<cpu>-<os>/'#010+
-  'ifdef COMPIL','ER_UNITTARGETDIR'#010+
-  'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
-  'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
-  'override UNITTARGETDIRPREFIX='#010+
-  'else'#010+
-  'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+
-  'endif'#010+
-  'else'#010+
-  'ifdef COMPILER_TARGETDIR'#010+
-  'override COMPIL','ER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
-  'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'ifdef CREATESHARED'#010+
-  'override FPCOPT+=-Cg'#010+
-  #010+
-  'ifeq ($(CPU_TARGET),i386)'#010+
-  'override FPCOPT+=-Aas'#010+
-  'endif'#010+
-  #010+
-  'endif'#010+
-  #010+
-  '# create always pic'#039'ed code on x86_64',#010+
-  'ifeq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+
-  'ifeq ($(OS_TARGET),linux)'#010+
-  'ifeq ($(CPU_TARGET),x86_64)'#010+
-  'override FPCOPT+=-Cg'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'ifdef LINKSHARED'#010+
-  '#!!! deactived for testing override FPCOPT+=-XD'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[command_libc]'#010+
-  '# Add GCC lib p','ath if asked'#010+
-  'ifdef GCCLIBDIR'#010+
-  'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
-  'endif'#010+
-  'ifdef OTHERLIBDIR'#010+
-  'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[command_end]'#010+
-  '# Add commandline options last so they can override'#010+
-  'ifdef OPT'#010+
-  'override FPCOPT+=$(OP','T)'#010+
-  'endif'#010+
-  #010+
-  '# Add defines from FPCOPTDEF to FPCOPT'#010+
-  'ifdef FPCOPTDEF'#010+
-  'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
-  'endif'#010+
-  #010+
-  '# Was a config file specified ?'#010+
-  'ifdef CFGFILE'#010+
-  'override FPCOPT+=@$(CFGFILE)'#010+
-  'endif'#010+
-  #010+
-  '# Use the environment to pass commandlin','e options?'#010+
-  'ifdef USEENV'#010+
-  'override FPCEXTCMD:=$(FPCOPT)'#010+
-  'override FPCOPT:=!FPCEXTCMD'#010+
-  'export FPCEXTCMD'#010+
-  'endif'#010+
-  #010+
-  'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
-  'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
-  #010+
-  'ifneq ($(AFULL_TARGET),$(AFULL_SOUR','CE))'#010+
-  'override ACROSSCOMPILE=1'#010+
-  'endif'#010+
-  #010+
-  'ifdef ACROSSCOMPILE'#010+
-  'override FPCOPT+=$(CROSSOPT)'#010+
-  'endif'#010+
-  #010+
-  '# Compiler commandline'#010+
-  'override COMPILER:=$(FPC) $(FPCOPT)'#010+
-  #010+
-  '# also call ppas if with command option -s'#010+
-  '# but only if the FULL_SOURCE and FULL_TARGE','T are equal'#010+
-  'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
-  'EXECPPAS='#010+
-  'else'#010+
-  'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+
-  'ifdef RUNBATCH'#010+
-  'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+
-  'else'#010+
-  'EXECPPAS:=@$(PPAS)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[loaderrules]'#010+
-  '##################################','##################################'+
-  '#'#010+
-  '# Loaders'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_loaders'#010+
-  #010+
-  'ifneq ($(TARGET_LOADERS),)'#010+
-  'override ALLTARGET+=fpc_loaders'#010+
-  'override CLEANTARGET+=fpc_loaders_clean'#010+
-  'ove','rride INSTALLTARGET+=fpc_loaders_install'#010+
-  #010+
-  'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
-  'endif'#010+
-  #010+
-  '%$(OEXT): %$(LOADEREXT)'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
-  '        $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
-  'else'#010+
-  '        $(AS) -','o $*$(OEXT) $<'#010+
-  'endif'#010+
-  #010+
-  'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+
-  #010+
-  'fpc_loaders_clean:'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
+  '#'#013#010+
+  #013#010+
+  '.PHONY: fpc_loaders'#013#010+
+  #013#010+
+  'ifneq ($(TARGET_LOADERS),)'#013#010+
+  'override ALLTARGET+=fpc_loaders'#013#010+
+  'override CLEANTARGET+=fpc_loaders_clean'#013#010+
+  'override INSTALLTARGET+=fpc_loaders_install'#013#010+
+  #013#010+
+  'overri','de LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '%$(OEXT): %$(LOADEREXT)'#013#010+
+  'ifdef COMPILER_UNITTARGETDIR'#013#010+
+  '        $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#013#010+
+  'else'#013#010+
+  '        $(AS) -o $*$(OEXT) $<'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_loaders: $(C','OMPILER_UNITTARGETDIR) $(LOADEROFILES)'#013#010+
+  #013#010+
+  'fpc_loaders_clean:'#013#010+
+  'ifdef COMPILER_UNITTARGETDIR'#013#010+
   '        -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+
-  ')'#010+
-  'else'#010+
-  '        -$(DEL) $(LOADEROFILES)'#010+
-  'endif',#010+
-  #010+
-  'fpc_loaders_install:'#010+
-  '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
+  ')'#013#010+
+  'else'#013#010+
+  '        -$(DEL) $(LOADEROFILES)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_loaders_install:'#013#010+
+  '     ','   $(MKDIR) $(INSTALL_UNITDIR)'#013#010+
+  'ifdef COMPILER_UNITTARGETDIR'#013#010+
   '        $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+
-  'ES)) $(INSTALL_UNITDIR)'#010+
-  'else'#010+
-  '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)',#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[unitrules]'#010+
-  '#####################################################################'#010+
-  '# Units'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_units'#010+
-  #010+
-  'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+
-  'ove','rride ALLTARGET+=fpc_units'#010+
-  #010+
-  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
+  'ES)) $(INSTALL_UNITDIR)'#013#010+
+  'else'#013#010+
+  '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[unitrules]',#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Units'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_units'#013#010+
+  #013#010+
+  'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#013#010+
+  'override ALLTAR','GET+=fpc_units'#013#010+
+  #013#010+
+  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#013#010+
   'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+
-  'NITS))'#010+
-  'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
-  'override',' CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
-  'endif'#010+
-  #010+
-  'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+
-  #010+
-  #010+
-  '[exerules]'#010+
-  '#####################################################################'#010+
-  '# Exes'#010+
-  '##################################','##################################'+
-  '#'#010+
-  #010+
-  '.PHONY: fpc_exes'#010+
-  #010+
-  '# Programs are not needed for a cross installation'#010+
-  'ifndef CROSSINSTALL'#010+
-  'ifneq ($(TARGET_PROGRAMS),)'#010+
-  'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
-  'override EXEOFILES:=$(adds','uffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+
+  'NITS))'#013#010+
+  'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#013#010+
+  'override CLEANP','PUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#013#010+
+  #013#010+
+  #013#010+
+  '[exerules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Exes'#013#010+
+  '################################','####################################'+
+  '#'#013#010+
+  #013#010+
+  '.PHONY: fpc_exes'#013#010+
+  #013#010+
+  '# Programs are not needed for a cross installation'#013#010+
+  'ifndef CROSSINSTALL'#013#010+
+  'ifneq ($(TARGET_PROGRAMS),)'#013#010+
+  'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#013#010+
+  'override EXEOFIL','ES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+
   'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+
   ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+
-  'PROGRAMS)))'#010+
-  #010+
-  'override ALLTARGET+=fpc_exes'#010+
-  'override INSTALL','EXEFILES+=$(EXEFILES)'#010+
-  'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
-  'ifeq ($(OS_TARGET),os2)'#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
-  'endif'#010+
-  'ifeq ($(OS_TARGET),emx)'#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$','(TARGET_PROGRAMS))'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+
-  #010+
-  #010+
-  '[rstrules]'#010+
-  '#####################################################################'#010+
-  '# Resource strings'#010+
-  '##############################','######################################'+
-  '#'#010+
-  #010+
-  'ifdef TARGET_RSTS'#010+
-  'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
-  #010+
-  'override CLEANRSTFILES+=$(RSTFILES)'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[examplerules]'#010+
-  '#################################################################','###'+
-  '#'#010+
-  '# Examples'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_examples'#010+
-  #010+
-  'ifneq ($(TARGET_EXAMPLES),)'#010+
-  'HASEXAMPLES=1'#010+
-  'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+
-  'LES)) $(addsuffix .','pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+
-  '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+
-  'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
-  'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
-  'refix ','$(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
+  'PROGRAMS)))'#013#010+
+  #013#010+
+  'override ALLTARGET+=fpc_exes'#013#010+
+  'ove','rride INSTALLEXEFILES+=$(EXEFILES)'#013#010+
+  'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#013#010+
+  'ifeq ($(OS_TARGET),os2)'#013#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#013+
+  #010+
+  'endif'#013#010+
+  'ifeq ($(OS_TARGET),emx)'#013#010+
+  'override CLEANEXEFILES+=$(add','suffix $(AOUTEXT),$(TARGET_PROGRAMS))'#013+
+  #010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#013+
+  #010+
+  #013#010+
+  #013#010+
+  '[rstrules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Resource strings'#013#010,
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  'ifdef TARGET_RSTS'#013#010+
+  'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#013#010+
+  #013#010+
+  'override CLEANRSTFILES+=$(RSTFILES)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[examplerules]'#013#010+
+  '#########################','###########################################'+
+  '#'#013#010+
+  '# Examples'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_examples'#013#010+
+  #013#010+
+  'ifneq ($(TARGET_EXAMPLES),)'#013#010+
+  'HASEXAMPLES=1'#013#010+
+  'override EXAMPLESOURCEFILES:=$(wildcard $','(addsuffix .pp,$(TARGET_EXA'+
+  'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+
+  '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#013#010+
+  'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#013#010+
+  'override EXAMPLEOFILES:=$(','addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+
+  'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
   'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+
-  'GET_EXAMPLES)))'#010+
-  #010+
-  'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
-  'ifeq ($(OS_TARGET),os2)'#010+
-  'override C','LEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
-  'endif'#010+
-  'ifeq ($(OS_TARGET),emx)'#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
-  'endif'#010+
-  'endif'#010+
-  'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+
-  'HASEXAMPLES=1'#010+
-  'endif'#010+
-  #010+
-  'fpc_examples: all $(EX','AMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+
-  'IRS))'#010+
-  #010+
-  #010+
-  '[compilerules]'#010+
-  '#####################################################################'#010+
-  '# General compile rules'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY',': fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+
-  #010+
-  '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
-  '        @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
-  #010+
-  'fpc_all: $(FPCMADE)'#010+
-  #010+
-  'fpc_smart:'#010+
-  '        $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
-  #010+
-  'fpc_debug:'#010+
-  '       ',' $(MAKE) all DEBUG=1'#010+
-  #010+
-  'fpc_release:'#010+
-  '        $(MAKE) all RELEASE=1'#010+
-  #010+
+  'GET_EXAMPLES)))'#013#010+
+  #013#010+
+  'override CLEANEXEFILES+=$(EXAMPLEFILES)',' $(EXAMPLEOFILES)'#013#010+
+  'ifeq ($(OS_TARGET),os2)'#013#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#013+
+  #010+
+  'endif'#013#010+
+  'ifeq ($(OS_TARGET),emx)'#013#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#013+
+  #010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'ifneq ($(TARGE','T_EXAMPLEDIRS),)'#013#010+
+  'HASEXAMPLES=1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+
+  'S))'#013#010+
+  #013#010+
+  #013#010+
+  '[compilerules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# General compile rules'#013#010+
+  '#######','#############################################################'+
+  '#'#013#010+
+  #013#010+
+  '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#013#010+
+  #013#010+
+  '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#013#010+
+  '        @$(ECHOREDIR) Compiled > $(FPCMADE)'#013#010+
+  #013#010+
+  'fpc_all: $(FPCMADE)'#013,#010+
+  #013#010+
+  'fpc_smart:'#013#010+
+  '        $(MAKE) all LINKSMART=1 CREATESMART=1'#013#010+
+  #013#010+
+  'fpc_debug:'#013#010+
+  '        $(MAKE) all DEBUG=1'#013#010+
+  #013#010+
+  'fpc_release:'#013#010+
+  '        $(MAKE) all RELEASE=1'#013#010+
+  #013#010+
   '# General compile rules, available for both possible .pp and .pas exte'+
-  'nsions'#010+
-  #010+
-  '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+
-  #010+
-  '$(COMPILER_UNITTARGETDIR):'#010+
-  ' ','       $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
-  #010+
-  '$(COMPILER_TARGETDIR):'#010+
-  '        $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
-  #010+
-  '%$(PPUEXT): %.pp'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
-  #010+
-  '%$(PPUEXT): %.pas'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
-  #010+
-  '%$(','EXEEXT): %.pp'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
-  #010+
-  '%$(EXEEXT): %.pas'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
-  #010+
-  '%$(EXEEXT): %.lpr'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
-  #010+
-  '%$(EXEEXT): %.dpr'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPA','S)'#010+
-  #010+
-  '%.res: %.rc'#010+
-  '        windres -i $< -o $@'#010+
-  #010+
-  '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+
-  'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %.lpr $(COMPILER_SOURCEDIR) $','(COMPILER_INCLUDEDIR)'#010+
-  'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
-  'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
-  #010+
-  '[sharedrules]'#010+
-  '###########################','#########################################'+
-  '#'#010+
-  '# Library'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_shared'#010+
-  #010+
-  'override INSTALLTARGET+=fpc_shared_install'#010+
-  #010+
-  'ifndef SHARED_LIBVERSION'#010+
-  'SHARED_LIBVERSION=$(FPC_VER','SION)'#010+
-  'endif'#010+
-  #010+
-  'ifndef SHARED_LIBNAME'#010+
-  'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  #010+
-  'ifndef SHARED_FULLNAME'#010+
+  'nsions'#013#010+
+  #013#010+
+  '.SUFFI','XES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#013+
+  #010+
+  #013#010+
+  '$(COMPILER_UNITTARGETDIR):'#013#010+
+  '        $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#013#010+
+  #013#010+
+  '$(COMPILER_TARGETDIR):'#013#010+
+  '        $(MKDIRTREE) $(COMPILER_TARGETDIR)'#013#010+
+  #013#010+
+  '%$(PPUEXT): %.pp'#013#010+
+  '        $(','COMPILER) $<'#013#010+
+  '        $(EXECPPAS)'#013#010+
+  #013#010+
+  '%$(PPUEXT): %.pas'#013#010+
+  '        $(COMPILER) $<'#013#010+
+  '        $(EXECPPAS)'#013#010+
+  #013#010+
+  '%$(EXEEXT): %.pp'#013#010+
+  '        $(COMPILER) $<'#013#010+
+  '        $(EXECPPAS)'#013#010+
+  #013#010+
+  '%$(EXEEXT): %.pas'#013#010+
+  '        $(COMPILER) $<'#013#010+
+  '        $(EXECPPAS)'#013#010+
+  #013#010+
+  '%$(EXE','EXT): %.lpr'#013#010+
+  '        $(COMPILER) $<'#013#010+
+  '        $(EXECPPAS)'#013#010+
+  #013#010+
+  '%$(EXEEXT): %.dpr'#013#010+
+  '        $(COMPILER) $<'#013#010+
+  '        $(EXECPPAS)'#013#010+
+  #013#010+
+  '%.res: %.rc'#013#010+
+  '        windres -i $< -o $@'#013#010+
+  #013#010+
+  '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#013#010+
+  'vpath %.pp $(COMPILER_','SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
+  'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
+  'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
+  'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
+  'vpath %.inc $(COMPILER_INCLUDED','IR)'#013#010+
+  'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#013#010+
+  'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#013#010+
+  #013#010+
+  '[sharedrules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Library'#013#010+
+  '##################################################','##################'+
+  '#'#013#010+
+  #013#010+
+  '.PHONY: fpc_shared'#013#010+
+  #013#010+
+  'override INSTALLTARGET+=fpc_shared_install'#013#010+
+  #013#010+
+  'ifndef SHARED_LIBVERSION'#013#010+
+  'SHARED_LIBVERSION=$(FPC_VERSION)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifndef SHARED_LIBNAME'#013#010+
+  'SHARED_LIBNAME=$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifndef SHARED_FU','LLNAME'#013#010+
   'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+
-  'N)$(SHAREDLIBEXT)'#010+
-  'endif'#010+
+  'N)$(SHAREDLIBEXT)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Default sharedlib units are all unit objects'#013#010+
+  'ifndef SHARED_LIBUNITS'#013#010+
+  'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#013#010+
+  'over','ride SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED'+
+  '_LIBUNITS))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_shared:'#013#010+
+  'ifdef HASSHAREDLIB'#013#010+
+  '        $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#013#010+
+  'ifneq ($(SHARED_BUILD),n)'#013#010+
+  '        $(PPUMOVE) -q $(SHARED_','LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+
+  ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  '        @$(ECHO) Shared Libraries not supported'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_shared_install:'#013#010+
+  'ifneq ($(SHARED_BUILD),n)'#013#010+
+  'ifneq ($(SHARED_LIBUNITS),)'#013#010+
+  'ifne','q ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#013+
   #010+
-  '# Default sharedlib units are all unit objects'#010+
-  'if','ndef SHARED_LIBUNITS'#010+
-  'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
-  'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+
-  'IBUNITS))'#010+
-  'endif'#010+
-  #010+
-  'fpc_shared:'#010+
-  'ifdef HASSHAREDLIB'#010+
-  '        $(MAKE) all CREATESHARED=1 LINKSHARE','D=1 CREATESMART=1'#010+
-  'ifneq ($(SHARED_BUILD),n)'#010+
-  '        $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+
-  'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+
-  'endif'#010+
-  'else'#010+
-  '        @$(ECHO) Shared Libraries not supported'#010+
-  'endif'#010+
-  #010+
-  'fpc_shared_i','nstall:'#010+
-  'ifneq ($(SHARED_BUILD),n)'#010+
-  'ifneq ($(SHARED_LIBUNITS),)'#010+
-  'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
   '        $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
-  'ALL_SHAREDDIR)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '[install','rules]'#010+
-  '#####################################################################'#010+
-  '# Install rules'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
-  #010+
-  'ifdef INSTALL_UNIT','S'#010+
-  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
-  'endif'#010+
-  #010+
-  'ifdef INSTALL_BUILDUNIT'#010+
+  'ALL_SHAREDDIR)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '[installrules]'#013#010+
+  '####################################################','################'+
+  '#'#013#010+
+  '# Install rules'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#013#010+
+  #013#010+
+  'ifdef INSTALL_UNITS'#013#010+
+  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(','INSTALL_UNITS))'#013+
+  #010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef INSTALL_BUILDUNIT'#013#010+
   'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+
-  '(INSTALLPPUFILES))'#010+
-  'endif'#010+
-  #010+
-  'ifdef INSTALLPPUFILES'#010+
-  'override INSTALLPPULINK','FILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
+  '(INSTALLPPUFILES))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef INSTALLPPUFILES'#013#010+
+  'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPP','U'+
   'FILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+
   'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+
-  'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+
-  'ifneq ($(UNITTA','RGETDIRPREFIX),)'#010+
-  'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+
-  '$(INSTALLPPUFILES)))'#010+
+  'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#013#010+
+  'ifneq ($(UNITTARGETDIRPREFIX),)'#013#010+
+  'override INSTALLPPUFILES:','=$(addprefix $(UNITTARGETDIRPREFIX),$(notdi'+
+  'r $(INSTALLPPUFILES)))'#013#010+
   'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
-  'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+
-  'endif'#010+
-  '# Implicitly in','stall Package.fpc'#010+
-  'override INSTALL_CREATEPACKAGEFPC=1'#010+
-  'endif'#010+
-  #010+
-  'ifdef INSTALLEXEFILES'#010+
-  'ifneq ($(TARGETDIRPREFIX),)'#010+
+  'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#013#010+
+  'endif'#013#010+
+  '# Implicitly install Package.fpc'#013#010+
+  'override INSTALL_CRE','ATEPACKAGEFPC=1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef INSTALLEXEFILES'#013#010+
+  'ifneq ($(TARGETDIRPREFIX),)'#013#010+
   'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+
-  'STALLEXEFILES)))'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'fpc_install: all $(INSTALLTAR','GET)'#010+
-  'ifdef INSTALLEXEFILES'#010+
-  '        $(MKDIR) $(INSTALL_BINDIR)'#010+
-  '# Compress the exes if upx is defined'#010+
-  'ifdef UPXPROG'#010+
-  '        -$(UPXPROG) $(INSTALLEXEFILES)'#010+
-  'endif'#010+
-  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
-  'endif'#010+
-  'ifdef INSTALL_CR','EATEPACKAGEFPC'#010+
-  'ifdef FPCMAKE'#010+
+  'STALLEXEFILES)))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_install: all $(INSTALLTARGET)'#013#010+
+  'ifdef INSTALLEXEFILES'#013#010,
+  '        $(MKDIR) $(INSTALL_BINDIR)'#013#010+
+  '# Compress the exes if upx is defined'#013#010+
+  'ifdef UPXPROG'#013#010+
+  '        -$(UPXPROG) $(INSTALLEXEFILES)'#013#010+
+  'endif'#013#010+
+  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#013#010+
+  'endif'#013#010+
+  'ifdef INSTALL_CREATEPACKAGEFPC'#013#010+
+  'ifde','f FPCMAKE'#013#010+
   '# If the fpcpackage variable is set then create and install Package.fp'+
-  'c,'#010+
-  '# a safety check is done if Makefile.fpc is available'#010+
-  'ifdef PACKAGE_VERSION'#010+
-  'ifneq ($(wildcard Makefile.fpc),)'#010+
-  '        $(FPCMAKE) -p -T$(CP','U_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
-  '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
-  '        $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'ifdef INSTALLPPUFILES'#010+
-  '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
-  '        $(INSTALL) $(INSTALLPPUFILES',') $(INSTALL_UNITDIR)'#010+
-  'ifneq ($(INSTALLPPULINKFILES),)'#010+
-  '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
-  'endif'#010+
-  'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
-  '        $(MKDIR) $(INSTALL_LIBDIR)'#010+
-  '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIB','DIR)'#010+
-  'ifdef inUnix'#010+
-  '        ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'ifdef INSTALL_FILES'#010+
-  '        $(MKDIR) $(INSTALL_DATADIR)'#010+
-  '        $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
-  'endif'#010+
-  #010+
-  'fpc_sourceinstall: distcl','ean'#010+
-  '        $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
-  '        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
-  #010+
-  'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
-  'ifdef HASEXAMPLES'#010+
-  '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
-  'endif'#010+
-  'ifdef EXAMPLES','OURCEFILES'#010+
-  '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
-  'endif'#010+
-  'ifdef TARGET_EXAMPLEDIRS'#010+
+  'c,'#013#010+
+  '# a safety check is done if Makefile.fpc is available'#013#010+
+  'ifdef PACKAGE_VERSION'#013#010+
+  'ifneq ($(wildcard Makefile.fpc),)'#013#010+
+  '        $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS','_TARGET) Makefile.fpc'#013#010+
+  '        $(MKDIR) $(INSTALL_UNITDIR)'#013#010+
+  '        $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'ifdef INSTALLPPUFILES'#013#010+
+  '        $(MKDIR) $(INSTALL_UNITDIR)'#013#010+
+  '        $(INSTALL) $(INSTALLPPUFILES) $(I','NSTALL_UNITDIR)'#013#010+
+  'ifneq ($(INSTALLPPULINKFILES),)'#013#010+
+  '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#013#010+
+  'endif'#013#010+
+  'ifneq ($(wildcard $(LIB_FULLNAME)),)'#013#010+
+  '        $(MKDIR) $(INSTALL_LIBDIR)'#013#010+
+  '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LI','BDIR)'#013#010+
+  'ifdef inUnix'#013#010+
+  '        ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'ifdef INSTALL_FILES'#013#010+
+  '        $(MKDIR) $(INSTALL_DATADIR)'#013#010+
+  '        $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_sourceins','tall: distclean'#013#010+
+  '        $(MKDIR) $(INSTALL_SOURCEDIR)'#013#010+
+  '        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#013#010+
+  #013#010+
+  'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#013#010+
+  'ifdef HASEXAMPLES'#013#010+
+  '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#013#010+
+  'e','ndif'#013#010+
+  'ifdef EXAMPLESOURCEFILES'#013#010+
+  '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#013#010+
+  'endif'#013#010+
+  'ifdef TARGET_EXAMPLEDIRS'#013#010+
   '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
-  'AMPLEDIR)'#010+
-  'endif'#010+
-  #010+
-  '[distinstallrules]'#010+
-  '################################','####################################'+
-  '#'#010+
-  '# Dist Install'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_distinstall'#010+
-  #010+
-  'fpc_distinstall: install exampleinstall'#010+
-  #010+
-  #010+
-  '[zipinstallrules]'#010+
-  '###############################','#####################################'+
-  '#'#010+
-  '# Zip'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
-  #010+
-  '# Temporary path to pack a file, can only use a single de','ep'#010+
-  '# subdir, because the deltree can'#039't see the whole tree to remove'#010+
-  'ifndef PACKDIR'#010+
-  'ifndef inUnix'#010+
-  'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
-  'else'#010+
-  'PACKDIR=/tmp/fpc-pack'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Maybe create default zipname from packagename'#010+
-  'ifndef ZIPNAME'#010+
-  'ifdef DIS','T_ZIPNAME'#010+
-  'ZIPNAME=$(DIST_ZIPNAME)'#010+
-  'else'#010+
-  'ZIPNAME=$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'ifndef FULLZIPNAME'#010+
-  'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
-  'endif'#010+
-  #010+
-  '# ZipTarget'#010+
-  'ifndef ZIPTARGET'#010+
-  'ifdef DIST_ZIPTARGET'#010+
-  'ZIPTARGET=DIST_ZIPTARGET',#010+
-  'else'#010+
-  'ZIPTARGET=install'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Use tar by default under linux'#010+
-  'ifndef USEZIP'#010+
-  'ifdef inUnix'#010+
-  'USETAR=1'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Use a wrapper script by default for Os/2'#010+
-  'ifndef inUnix'#010+
-  'USEZIPWRAPPER=1'#010+
-  'endif'#010+
-  #010+
-  '# We need to be able to run in the curren','t OS so fix'#010+
-  '# the path separator'#010+
-  'ifdef USEZIPWRAPPER'#010+
-  'ZIPPATHSEP=$(PATHSEP)'#010+
-  'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
-  'else'#010+
-  'ZIPPATHSEP=/'#010+
-  'endif'#010+
-  #010+
-  '# Create commands to create the zip/tar file'#010+
-  'ZIPCMD_CDPACK:=cd $(subst',' /,$(ZIPPATHSEP),$(PACKDIR))'#010+
-  'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
-  'ifdef USETAR'#010+
-  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
-  'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
-  'else'#010+
-  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FUL','LZIPNAME)$(ZIPEXT)'#010+
+  'AMPLEDIR)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '[distinstallrules]'#013#010+
+  '####','################################################################'+
+  '#'#013#010+
+  '# Dist Install'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_distinstall'#013#010+
+  #013#010+
+  'fpc_distinstall: install exampleinstall'#013#010+
+  #013#010+
+  #013#010+
+  '[zipinstallr','ules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Zip'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#013#010+
+  #013#010+
+  '# Temporary p','ath to pack a file, can only use a single deep'#013#010+
+  '# subdir, because the deltree can'#039't see the whole tree to remove'#013+
+  #010+
+  'ifndef PACKDIR'#013#010+
+  'ifndef inUnix'#013#010+
+  'PACKDIR=$(BASEDIR)/../fpc-pack'#013#010+
+  'else'#013#010+
+  'PACKDIR=/tmp/fpc-pack'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Maybe create def','ault zipname from packagename'#013#010+
+  'ifndef ZIPNAME'#013#010+
+  'ifdef DIST_ZIPNAME'#013#010+
+  'ZIPNAME=$(DIST_ZIPNAME)'#013#010+
+  'else'#013#010+
+  'ZIPNAME=$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifndef FULLZIPNAME'#013#010+
+  'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# ZipTa','rget'#013#010+
+  'ifndef ZIPTARGET'#013#010+
+  'ifdef DIST_ZIPTARGET'#013#010+
+  'ZIPTARGET=DIST_ZIPTARGET'#013#010+
+  'else'#013#010+
+  'ZIPTARGET=install'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Use tar by default under linux'#013#010+
+  'ifndef USEZIP'#013#010+
+  'ifdef inUnix'#013#010+
+  'USETAR=1'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Use a wrapper script by default for ','Os/2'#013#010+
+  'ifndef inUnix'#013#010+
+  'USEZIPWRAPPER=1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# We need to be able to run in the current OS so fix'#013#010+
+  '# the path separator'#013#010+
+  'ifdef USEZIPWRAPPER'#013#010+
+  'ZIPPATHSEP=$(PATHSEP)'#013#010+
+  'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#013+
+  #010+
+  'el','se'#013#010+
+  'ZIPPATHSEP=/'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Create commands to create the zip/tar file'#013#010+
+  'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#013#010+
+  'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#013#010+
+  'ifdef USETAR'#013#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)','$(TAREXT)'#013#010+
+  'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#013#010+
+  'else'#013#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#013#010+
   'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
-  'TFILE) *'#010+
-  'endif'#010+
-  #010+
-  'fpc_zipinstall:'#010+
-  '        $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
-  '        $(MKDIR) $(DIST_DESTDIR)'#010+
-  '        $(DEL) $(Z','IPDESTFILE)'#010+
-  'ifdef USEZIPWRAPPER'#010+
-  '# Handle gecho separate as we need to espace \ with \\'#010+
-  'ifneq ($(ECHOREDIR),echo)'#010+
-  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
-  'R)'#010+
-  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" ','>> $(ZIPWRAPPE'+
-  'R)'#010+
+  'TFILE) *'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_zipinstall:'#013#010+
+  '        $(','MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#013+
+  #010+
+  '        $(MKDIR) $(DIST_DESTDIR)'#013#010+
+  '        $(DEL) $(ZIPDESTFILE)'#013#010+
+  'ifdef USEZIPWRAPPER'#013#010+
+  '# Handle gecho separate as we need to espace \ with \\'#013#010+
+  'ifneq ($(ECHOREDIR),echo)'#013#010+
+  '        $(EC','HOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+
+  'PER)'#013#010+
+  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
+  #013#010+
   '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
-  'ER)'#010+
-  'else'#010+
-  '        echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
-  '        echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
-  '        echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
-  'endif'#010+
-  'i','fdef inUnix'#010+
-  '        /bin/sh $(ZIPWRAPPER)'#010+
-  'else'#010+
-  'ifdef RUNBATCH'#010+
-  '        $(RUNBATCH) $(ZIPWRAPPER)'#010+
-  'else'#010+
-  '        $(ZIPWRAPPER)'#010+
-  'endif'#010+
-  'endif'#010+
-  '        $(DEL) $(ZIPWRAPPER)'#010+
-  'else'#010+
-  '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
-  'endif'#010+
-  '     ','   $(DELTREE) $(PACKDIR)'#010+
-  #010+
-  'fpc_zipsourceinstall:'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+
-  'SOURCESUFFIX)'#010+
-  #010+
-  'fpc_zipexampleinstall:'#010+
-  'ifdef HASEXAMPLES'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=','$('+
-  'ZIPEXAMPLESUFFIX)'#010+
-  'endif'#010+
-  #010+
-  'fpc_zipdistinstall:'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
-  #010+
-  #010+
-  '[cleanrules]'#010+
-  '#####################################################################'#010+
-  '# Clean rules'#010+
-  '#########################################','###########################'+
-  '#'#010+
-  #010+
-  '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
-  #010+
-  'ifdef EXEFILES'#010+
+  'ER)'#013#010+
+  'else'#013#010+
+  '        echo $(ZIPCMD_CDP','ACK) > $(ZIPWRAPPER)'#013#010+
+  '        echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#013#010+
+  '        echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#013#010+
+  'endif'#013#010+
+  'ifdef inUnix'#013#010+
+  '        /bin/sh $(ZIPWRAPPER)'#013#010+
+  'else'#013#010+
+  'ifdef RUNBATCH'#013#010+
+  '        $(RUNBATCH) $(ZIPWRAPPER)'#013#010+
+  'else'#013#010+
+  '        $(','ZIPWRAPPER)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  '        $(DEL) $(ZIPWRAPPER)'#013#010+
+  'else'#013#010+
+  '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#013#010+
+  'endif'#013#010+
+  '        $(DELTREE) $(PACKDIR)'#013#010+
+  #013#010+
+  'fpc_zipsourceinstall:'#013#010+
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstal','l ZIPSUFFIX=$(Z'+
+  'IPSOURCESUFFIX)'#013#010+
+  #013#010+
+  'fpc_zipexampleinstall:'#013#010+
+  'ifdef HASEXAMPLES'#013#010+
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
+  'PEXAMPLESUFFIX)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_zipdistinstall:'#013#010+
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=disti','nstall'#013#010+
+  #013#010+
+  #013#010+
+  '[cleanrules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Clean rules'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#013#010+
+  #013#010+
+  'ifdef E','XEFILES'#013#010+
   'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
-  '))'#010+
-  'endif'#010+
-  #010+
-  'ifdef CLEAN_PROGRAMS'#010+
-  'override CLEANEXEFILES+=$(addprefix $(TARGETDIRP','REFIX),$(addsuffix $'+
-  '(EXEEXT), $(CLEAN_PROGRAMS)))'#010+
-  'endif'#010+
-  #010+
-  'ifdef CLEAN_UNITS'#010+
-  'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
-  'endif'#010+
-  #010+
-  'ifdef CLEANPPUFILES'#010+
+  '))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef CLEAN_PROGRAMS'#013#010+
+  'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
+  'XEEXT), $(CLEAN_PROGRAMS)))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef CLEAN_UNITS'#013,#010+
+  'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef CLEANPPUFILES'#013#010+
   'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
-  ') $(ad','dprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
-  '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+
-  'TATICLIBEXT),$(CLEANPPUFILES)))'#010+
-  'ifdef DEBUGSYMEXT'#010+
-  'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEX','T),$(CLEAN'+
-  'PPUFILES))'#010+
-  'endif'#010+
-  'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
-  'ILES))'#010+
+  ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
+  'LEANPP','UFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+
+  'TATICLIBEXT),$(CLEANPPUFILES)))'#013#010+
+  'ifdef DEBUGSYMEXT'#013#010+
+  'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
+  'UFILES))'#013#010+
+  'endif'#013#010+
+  'override CLEANPPUFILES:=$(addprefix $(U','NITTARGETDIRPREFIX),$(CLEANPP'+
+  'UFILES))'#013#010+
   'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
-  'IX),$(CLEANPPULINKFILES)))'#010+
-  'endif'#010+
-  #010+
-  'fpc_clean: $(CLEANTARGET)'#010+
-  'ifdef ','CLEANEXEFILES'#010+
-  '        -$(DEL) $(CLEANEXEFILES)'#010+
-  'endif'#010+
-  'ifdef CLEANPPUFILES'#010+
-  '        -$(DEL) $(CLEANPPUFILES)'#010+
-  'endif'#010+
-  'ifneq ($(CLEANPPULINKFILES),)'#010+
-  '        -$(DEL) $(CLEANPPULINKFILES)'#010+
-  'endif'#010+
-  'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(addprefix $(UNITT','ARGETDIRPREFIX),$(CLEANRSTFILES))'+
-  #010+
-  'endif'#010+
-  'ifdef CLEAN_FILES'#010+
-  '        -$(DEL) $(CLEAN_FILES)'#010+
-  'endif'#010+
-  'ifdef LIB_NAME'#010+
-  '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
-  'endif'#010+
+  'IX),$(CLEANPPULINKFILES)))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_clean: $(CLEANTARGET)'#013#010+
+  'ifdef CLEANEXEFILES'#013#010+
+  '        -$(DEL) $(CLEANEXEFILES)'#013#010+
+  'endif'#013#010+
+  'ifdef',' CLEANPPUFILES'#013#010+
+  '        -$(DEL) $(CLEANPPUFILES)'#013#010+
+  'endif'#013#010+
+  'ifneq ($(CLEANPPULINKFILES),)'#013#010+
+  '        -$(DEL) $(CLEANPPULINKFILES)'#013#010+
+  'endif'#013#010+
+  'ifdef CLEANRSTFILES'#013#010+
+  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#013+
+  #010+
+  'endif'#013#010+
+  'ifdef CLE','AN_FILES'#013#010+
+  '        -$(DEL) $(CLEAN_FILES)'#013#010+
+  'endif'#013#010+
+  'ifdef LIB_NAME'#013#010+
+  '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#013#010+
+  'endif'#013#010+
   '        -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
-  'PCEXTFILE)',' $(REDIRFILE)'#010+
-  '        -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
-  #010+
-  'fpc_cleanall: $(CLEANTARGET)'#010+
-  'ifdef CLEANEXEFILES'#010+
-  '        -$(DEL) $(CLEANEXEFILES)'#010+
-  'endif'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
-  'ifdef CLEANPPUFILES'#010+
-  '        -$(DEL) $(CLEANPPUFILES)'#010+
-  'endif'#010+
-  'ifne','q ($(CLEANPPULINKFILES),)'#010+
-  '        -$(DEL) $(CLEANPPULINKFILES)'#010+
-  'endif'#010+
-  'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
-  'endif'#010+
-  'endif'#010+
-  'ifdef CLEAN_FILES'#010+
-  '        -$(DEL) $(CLEAN_FILES)'#010+
-  'endif'#010+
-  '        -$(DELT','REE) units'#010+
-  '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
-  'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
-  'ifneq ($(PPUEXT),.ppu)'#010+
-  '        -$(DEL) *.o *.ppu *.a'#010+
-  'endif'#010+
-  '        -$(DELTREE) *$(SMARTEXT)'#010+
-  '        -$(DEL) fpcmade.* Package.','fpc $(PPAS) script.res link.res $('+
-  'FPCEXTFILE) $(REDIRFILE)'#010+
-  '        -$(DEL) *_ppas$(BATCHEXT)'#010+
-  'ifdef AOUTEXT'#010+
-  '        -$(DEL) *$(AOUTEXT)'#010+
-  'endif'#010+
-  'ifdef DEBUGSYMEXT'#010+
-  '        -$(DEL) *$(DEBUGSYMEXT)'#010+
-  'endif'#010+
-  #010+
-  'fpc_distclean: cleanall'#010+
-  #010+
-  #010+
-  '[baseinforules]'#010,
-  '#####################################################################'#010+
-  '# Base info rules'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_baseinfo'#010+
-  #010+
-  'override INFORULES+=fpc_baseinfo'#010+
-  #010+
-  'fpc_baseinfo:'#010+
-  '        @$(','ECHO)'#010+
-  '        @$(ECHO)  == Package info =='#010+
-  '        @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#010+
-  '        @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  == Configuration info =='#010+
-  '        @$(ECHO)'#010+
-  '        @$(EC','HO)  FPC.......... $(FPC)'#010+
-  '        @$(ECHO)  FPC Version.. $(FPC_VERSION)'#010+
-  '        @$(ECHO)  Source CPU... $(CPU_SOURCE)'#010+
-  '        @$(ECHO)  Target CPU... $(CPU_TARGET)'#010+
-  '        @$(ECHO)  Source OS.... $(OS_SOURCE)'#010+
-  '        @$(ECHO)  Target OS...','. $(OS_TARGET)'#010+
-  '        @$(ECHO)  Full Source.. $(FULL_SOURCE)'#010+
-  '        @$(ECHO)  Full Target.. $(FULL_TARGET)'#010+
-  '        @$(ECHO)  SourceSuffix. $(SOURCESUFFIX)'#010+
-  '        @$(ECHO)  TargetSuffix. $(TARGETSUFFIX)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  ','== Directory info =='#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
-  '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#010+
-  '        @$(ECHO)  CrossBinDir..... $(CR','OSSBINDIR)'#010+
-  '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#010+
-  '        @$(ECHO)  PackagesDir..... $(PACKAGESDIR)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
-  '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
-  '        @$(ECHO)'#010,
-  '        @$(ECHO)  == Tools info =='#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  As........ $(AS)'#010+
-  '        @$(ECHO)  Ld........ $(LD)'#010+
-  '        @$(ECHO)  Ar........ $(AR)'#010+
-  '        @$(ECHO)  Rc........ $(RC)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Mv........ $(','MVPROG)'#010+
-  '        @$(ECHO)  Cp........ $(CPPROG)'#010+
-  '        @$(ECHO)  Rm........ $(RMPROG)'#010+
-  '        @$(ECHO)  GInstall.. $(GINSTALL)'#010+
-  '        @$(ECHO)  Echo...... $(ECHO)'#010+
-  '        @$(ECHO)  Shell..... $(SHELL)'#010+
-  '        @$(ECHO)  Date...... $(DATE)'#010+
-  ' ','       @$(ECHO)  FPCMake... $(FPCMAKE)'#010+
-  '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
-  '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
-  '        @$(ECHO)  Zip....... $(ZIPPROG)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  == Object info =='#010+
-  '        @$(ECHO)'#010+
-  '        @$(','ECHO)  Target Loaders........ $(TARGET_LOADERS)'#010+
-  '        @$(ECHO)  Target Units.......... $(TARGET_UNITS)'#010+
-  '        @$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
-  '        @$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)'#010+
-  '        @$','(ECHO)  Target Dirs........... $(TARGET_DIRS)'#010+
-  '        @$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)'#010+
-  '        @$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS)'#010,
-  '        @$(ECHO)  Clean Files......... $(CLEAN_FILES)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Install Units....... $(INSTALL_UNITS)'#010+
-  '        @$(ECHO)  Install Files....... $(INSTALL_FILES)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  == Install info =='#010+
-  '   ','     @$(ECHO)'#010+
-  '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
-  '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#010+
-  '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#010+
-  '        @$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
-  '        @$(EC','HO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
-  '        @$(ECHO)  FullZipName.......... $(FULLZIPNAME)'#010+
-  '        @$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)'#010+
-  '       ',' @$(ECHO)  Install binary dir... $(INSTALL_BINDIR)'#010+
-  '        @$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)'#010+
-  '        @$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)'#010+
-  '        @$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)'#010+
-  '        @$(','ECHO)  Install doc dir...... $(INSTALL_DOCDIR)'#010+
-  '        @$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
-  '        @$(ECHO)  Install data dir..... $(INSTALL_DATADIR)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Dist destination dir. $(DIST_DESTDIR)',#010+
-  '        @$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)'#010+
-  '        @$(ECHO)'#010+
-  #010+
-  '[inforules]'#010+
-  '#####################################################################'#010+
-  '# Info rules'#010+
-  '#####################################################################'#010,
-  #010+
-  '.PHONY: fpc_info'#010+
-  #010+
-  'fpc_info: $(INFORULES)'#010+
-  #010+
-  '[makefilerules]'#010+
-  '#####################################################################'#010+
-  '# Rebuild Makefile'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_makefile ','fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+
-  'b2 \'#010+
-  '        fpc_makefile_dirs'#010+
-  #010+
-  'fpc_makefile:'#010+
-  '        $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
-  #010+
-  'fpc_makefile_sub1:'#010+
-  'ifdef TARGET_DIRS'#010+
-  '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.','fpc,$(TAR'+
-  'GET_DIRS))'#010+
-  'endif'#010+
-  'ifdef TARGET_EXAMPLEDIRS'#010+
+  'PCEXTFILE) $(REDIRFILE)'#013#010+
+  '        -$(DEL) *$(ASMEXT) *','_ppas$(BATCHEXT)'#013#010+
+  #013#010+
+  'fpc_cleanall: $(CLEANTARGET)'#013#010+
+  'ifdef CLEANEXEFILES'#013#010+
+  '        -$(DEL) $(CLEANEXEFILES)'#013#010+
+  'endif'#013#010+
+  'ifdef COMPILER_UNITTARGETDIR'#013#010+
+  'ifdef CLEANPPUFILES'#013#010+
+  '        -$(DEL) $(CLEANPPUFILES)'#013#010+
+  'endif'#013#010+
+  'ifneq ($(CLEANPPULINKFILES),)'#013#010+
+  '     ','   -$(DEL) $(CLEANPPULINKFILES)'#013#010+
+  'endif'#013#010+
+  'ifdef CLEANRSTFILES'#013#010+
+  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#013+
+  #010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'ifdef CLEAN_FILES'#013#010+
+  '        -$(DEL) $(CLEAN_FILES)'#013#010+
+  'endif'#013#010+
+  '        -$(DELTREE) units'#013#010+
+  '        -$','(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+
+  'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#013#010+
+  'ifneq ($(PPUEXT),.ppu)'#013#010+
+  '        -$(DEL) *.o *.ppu *.a'#013#010+
+  'endif'#013#010+
+  '        -$(DELTREE) *$(SMARTEXT)'#013#010+
+  '        -$(DEL) fpcmade.* Package.fpc $(PPAS) scri','pt.res link.res $('+
+  'FPCEXTFILE) $(REDIRFILE)'#013#010+
+  '        -$(DEL) *_ppas$(BATCHEXT)'#013#010+
+  'ifdef AOUTEXT'#013#010+
+  '        -$(DEL) *$(AOUTEXT)'#013#010+
+  'endif'#013#010+
+  'ifdef DEBUGSYMEXT'#013#010+
+  '        -$(DEL) *$(DEBUGSYMEXT)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_distclean: cleanall'#013#010+
+  #013#010+
+  #013#010+
+  '[baseinforules]'#013#010+
+  '###','#################################################################'+
+  '#'#013#010+
+  '# Base info rules'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_baseinfo'#013#010+
+  #013#010+
+  'override INFORULES+=fpc_baseinfo'#013#010+
+  #013#010+
+  'fpc_baseinfo:'#013#010+
+  '     ','   @$(ECHO)'#013#010+
+  '        @$(ECHO)  == Package info =='#013#010+
+  '        @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#013#010+
+  '        @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  == Configuration info =='#013#010+
+  '        @$(ECHO)'#013#010,
+  '        @$(ECHO)  FPC.......... $(FPC)'#013#010+
+  '        @$(ECHO)  FPC Version.. $(FPC_VERSION)'#013#010+
+  '        @$(ECHO)  Source CPU... $(CPU_SOURCE)'#013#010+
+  '        @$(ECHO)  Target CPU... $(CPU_TARGET)'#013#010+
+  '        @$(ECHO)  Source OS.... $(OS_SOURCE)'#013#010+
+  '        @$(E','CHO)  Target OS.... $(OS_TARGET)'#013#010+
+  '        @$(ECHO)  Full Source.. $(FULL_SOURCE)'#013#010+
+  '        @$(ECHO)  Full Target.. $(FULL_TARGET)'#013#010+
+  '        @$(ECHO)  SourceSuffix. $(SOURCESUFFIX)'#013#010+
+  '        @$(ECHO)  TargetSuffix. $(TARGETSUFFIX)'#013#010+
+  '        @$(E','CHO)'#013#010+
+  '        @$(ECHO)  == Directory info =='#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  Basedir......... $(BASEDIR)'#013#010+
+  '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#013#010+
+  '        @','$(ECHO)  CrossBinDir..... $(CROSSBINDIR)'#013#010+
+  '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#013#010+
+  '        @$(ECHO)  PackagesDir..... $(PACKAGESDIR)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#013#010+
+  '        @$(ECHO)  Other library.','.. $(OTHERLIBDIR)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  == Tools info =='#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  As........ $(AS)'#013#010+
+  '        @$(ECHO)  Ld........ $(LD)'#013#010+
+  '        @$(ECHO)  Ar........ $(AR)'#013#010+
+  '        @$(ECHO)  Rc........ $(RC)'#013#010+
+  '     ','   @$(ECHO)'#013#010+
+  '        @$(ECHO)  Mv........ $(MVPROG)'#013#010+
+  '        @$(ECHO)  Cp........ $(CPPROG)'#013#010+
+  '        @$(ECHO)  Rm........ $(RMPROG)'#013#010+
+  '        @$(ECHO)  GInstall.. $(GINSTALL)'#013#010+
+  '        @$(ECHO)  Echo...... $(ECHO)'#013#010+
+  '        @$(ECHO)  Shell....','. $(SHELL)'#013#010+
+  '        @$(ECHO)  Date...... $(DATE)'#013#010+
+  '        @$(ECHO)  FPCMake... $(FPCMAKE)'#013#010+
+  '        @$(ECHO)  PPUMove... $(PPUMOVE)'#013#010+
+  '        @$(ECHO)  Upx....... $(UPXPROG)'#013#010+
+  '        @$(ECHO)  Zip....... $(ZIPPROG)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        ','@$(ECHO)  == Object info =='#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  Target Loaders........ $(TARGET_LOADERS)'#013#010+
+  '        @$(ECHO)  Target Units.......... $(TARGET_UNITS)'#013#010+
+  '        @$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)'#013#010+
+  '        @','$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)'#013#010+
+  '        @$(ECHO)  Target Dirs........... $(TARGET_DIRS)'#013#010+
+  '        @$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)'#013#010+
+  '        @$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#013#010+
+  '      ','  @$(ECHO)'#013#010+
+  '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS)'#013#010+
+  '        @$(ECHO)  Clean Files......... $(CLEAN_FILES)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  Install Units....... $(INSTALL_UNITS)'#013#010+
+  '        @$(ECHO)  Install Files....... $(IN','STALL_FILES)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  == Install info =='#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  DateStr.............. $(DATESTR)'#013#010+
+  '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#013#010+
+  '        @$(ECHO)  ZipPrefix............ $(ZIPPRE','FIX)'#013#010+
+  '        @$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#013#010+
+  '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#013#010+
+  '        @$(ECHO)  FullZipName.......... $(FULLZIPNAME)'#013#010+
+  '        @$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)'#013#010+
+  '  ','      @$(ECHO)'#013#010+
+  '        @$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)'#013#010+
+  '        @$(ECHO)  Install binary dir... $(INSTALL_BINDIR)'#013#010+
+  '        @$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)'#013#010+
+  '        @$(ECHO)  Install units dir.... $(INST','ALL_UNITDIR)'#013#010+
+  '        @$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)'#013#010+
+  '        @$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)'#013#010+
+  '        @$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)'#013#010+
+  '        @$(ECHO)  Install data dir..... $(','INSTALL_DATADIR)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  Dist destination dir. $(DIST_DESTDIR)'#013#010+
+  '        @$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)'#013#010+
+  '        @$(ECHO)'#013#010+
+  #013#010+
+  '[inforules]'#013#010+
+  '#########################################################','###########'+
+  '#'#013#010+
+  '# Info rules'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_info'#013#010+
+  #013#010+
+  'fpc_info: $(INFORULES)'#013#010+
+  #013#010+
+  '[makefilerules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Reb','uild Makefile'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
+  ' \'#013#010+
+  '        fpc_makefile_dirs'#013#010+
+  #013#010+
+  'fpc_makefile:'#013#010+
+  '        $(FPCMAKE) -w -T$(OS_TARGE','T) Makefile.fpc'#013#010+
+  #013#010+
+  'fpc_makefile_sub1:'#013#010+
+  'ifdef TARGET_DIRS'#013#010+
   '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
-  'T_EXAMPLEDIRS))'#010+
-  'endif'#010+
-  #010+
+  'T_DIRS))'#013#010+
+  'endif'#013#010+
+  'ifdef TARGET_EXAMPLEDIRS'#013#010+
+  '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARG',
+  'ET_EXAMPLEDIRS))'#013#010+
+  'endif'#013#010+
+  #013#010+
   'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
-  'EXAMPLEDIRS))'#010+
-  #010+
-  'fpc_makefil','e_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
-  #010+
-  'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
-  #010+
-  '[localmakefile]'#010+
-  '#####################################################################'#010+
-  '# Local Makefile'#010+
-  '#############################################','#######################'+
-  '#'#010+
-  #010+
-  'ifneq ($(wildcard fpcmake.loc),)'#010+
-  'include fpcmake.loc'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[userrules]'#010+
-  '#####################################################################'#010+
-  '# Users rules'#010+
-  '#########################################################','###########'+
-  '#'#010+
-  #010+
-  '[lclrules]'#010+
-  '#####################################################################'#010+
-  '# LCL Rules'#010+
-  '#####################################################################'#010+
-  #010+
-  '# LCL Platform'#010+
-  'ifndef LCL_PLATFORM'#010+
-  'ifneq ($(findstring $(OS_TA','RGET),win32 win64),)'#010+
-  'LCL_PLATFORM=win32'#010+
-  'else'#010+
-  'LCL_PLATFORM=gtk'#010+
-  'endif'#010+
-  'endif'#010+
-  'export LCL_PLATFORM'#010+
-  #010+
-  '# Check if the specified LCLDIR is correct'#010+
-  'ifdef LCLDIR'#010+
-  'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
-  'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM))',',)'#010+
-  'override LCLDIR=wrong'#010+
-  'endif'#010+
-  'else'#010+
-  'override LCLDIR=wrong'#010+
-  'endif'#010+
-  #010+
-  '# Check if the default LCLDIR is correct'#010+
-  'ifdef DEFAULT_LCLDIR'#010+
-  'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
-  'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
-  'override LCLD','IR=wrong'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Check for development version'#010+
-  'ifeq ($(LCLDIR),wrong)'#010+
+  'EXAMPLEDIRS))'#013#010+
+  #013#010+
+  'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#013#010+
+  #013#010+
+  'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#013#010+
+  #013#010+
+  '[localmakefile]'#013#010+
+  '##','##################################################################'+
+  '#'#013#010+
+  '# Local Makefile'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  'ifneq ($(wildcard fpcmake.loc),)'#013#010+
+  'include fpcmake.loc'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[userrules]'#013#010+
+  '#','###################################################################'+
+  '#'#013#010+
+  '# Users rules'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '[lclrules]'#013#010+
+  '#####################################################################'#013,
+  #010+
+  '# LCL Rules'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# LCL Platform'#013#010+
+  'ifndef LCL_PLATFORM'#013#010+
+  'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#013#010+
+  'LCL_PLATFORM=win32'#013#010+
+  'else'#013#010+
+  'LCL_PLATFORM=gtk'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export LC','L_PLATFORM'#013#010+
+  #013#010+
+  '# Check if the specified LCLDIR is correct'#013#010+
+  'ifdef LCLDIR'#013#010+
+  'override LCLDIR:=$(subst \,/,$(LCLDIR))'#013#010+
+  'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#013#010+
+  'override LCLDIR=wrong'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'override LCLDIR=wrong'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Chec','k if the default LCLDIR is correct'#013#010+
+  'ifdef DEFAULT_LCLDIR'#013#010+
+  'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#013#010+
+  'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#013#010+
+  'override LCLDIR=wrong'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Check for development version'#013#010+
+  'ifeq ($(','LCLDIR),wrong)'#013#010+
   'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
-  ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
-  'ifeq ($(LCLDIR),)'#010+
-  'override ','LCLDIR=wrong'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Check for release version'#010+
-  'ifeq ($(LCLDIR),wrong)'#010+
+  ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#013#010+
+  'ifeq ($(LCLDIR),)'#013#010+
+  'override LCLDIR=wrong'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Check for release version'#013#010,
+  'ifeq ($(LCLDIR),wrong)'#013#010+
   'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
-  ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
-  'ifeq ($(LCLDIR),)'#010+
-  'overrid','e LCLDIR=wrong'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Generate dirs'#010+
-  'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+
-  'IR)/units)'#010+
+  ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#013+
+  #010+
+  'ifeq ($(LCLDIR),)'#013#010+
+  'override LCLDIR=wrong'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Generate dirs'#013#010+
+  'ov','erride LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+
+  'LDIR)/units)'#013#010+
   'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
-  'nts $(LCLDIR)/components)'#010+
-  'export LCLDIR LCLUN','ITDIR LCLCOMPONENTDIR'#010+
-  #010+
-  '# Add LCL dirs to paths'#010+
-  'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
-  'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
-  #010+
-  '[lclinforules]'#010+
-  '#####################################################################'#010+
-  '# LCL Info rules'#010,
-  '#####################################################################'#010+
-  'override INFORULES+=lclinfo'#010+
-  #010+
-  '.PHONY: lclinfo'#010+
-  #010+
-  'lclinfo:'#010+
-  '        @$(ECHO)  == LCL info =='#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Platform............. $(LCL_PLATFORM)'#010+
-  '        @','$(ECHO)  LCLDIR............... $(LCLDIR)'#010+
-  '        @$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)'#010+
-  '        @$(ECHO)  LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
-  '        @$(ECHO)'#010
+  'nts $(LCLDIR)/components)'#013#010+
+  'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#013#010+
+  #013#010+
+  '# Add LCL dirs to p','aths'#013#010+
+  'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#013#010+
+  'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#013#010+
+  #013#010+
+  '[lclinforules]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# LCL Info rules'#013#010+
+  '###################################','#################################'+
+  '#'#013#010+
+  'override INFORULES+=lclinfo'#013#010+
+  #013#010+
+  '.PHONY: lclinfo'#013#010+
+  #013#010+
+  'lclinfo:'#013#010+
+  '        @$(ECHO)  == LCL info =='#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  Platform............. $(LCL_PLATFORM)'#013#010+
+  '        @$(ECHO)  LCLDIR...........','.... $(LCLDIR)'#013#010+
+  '        @$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)'#013#010+
+  '        @$(ECHO)  LCL Component dir.... $(LCLCOMPONENTDIR)'#013#010+
+  '        @$(ECHO)'#013#010
 );
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index 2af8bdcf36..5dadf31056 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -972,6 +972,13 @@ SHAREDLIBEXT=.dll
 SHORTSUFFIX=nativent
 endif
 
+# wii
+ifeq ($(OS_TARGET),wii)
+EXEEXT=.dol
+SHAREDLIBEXT=.so
+SHORTSUFFIX=wii
+endif
+
 else
 # long version for 1.0.x - target specific extensions
 
diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp
index 1a33c06ff4..bed704d682 100644
--- a/utils/fpcm/fpcmmain.pp
+++ b/utils/fpcm/fpcmmain.pp
@@ -70,7 +70,8 @@ interface
         o_linux,o_go32v2,o_win32,o_os2,o_freebsd,o_beos,o_haiku,o_netbsd,
         o_amiga,o_atari, o_solaris, o_qnx, o_netware, o_openbsd,o_wdosx,
         o_palmos,o_macos,o_darwin,o_emx,o_watcom,o_morphos,o_netwlibc,
-        o_win64,o_wince,o_gba,o_nds,o_embedded,o_symbian,o_nativent,o_iphonesim
+        o_win64,o_wince,o_gba,o_nds,o_embedded,o_symbian,o_nativent,o_iphonesim,
+        o_wii
       );
 
       TTargetSet=array[tcpu,tos] of boolean;
@@ -93,7 +94,7 @@ interface
         'amiga','atari','solaris', 'qnx', 'netware','openbsd','wdosx',
         'palmos','macos','darwin','emx','watcom','morphos','netwlibc',
         'win64','wince','gba','nds','embedded','symbian','nativent',
-        'iphonesim'
+        'iphonesim', 'wii'
       );
 
       OSSuffix : array[TOS] of string=(
@@ -101,7 +102,7 @@ interface
         '_amiga','_atari','_solaris', '_qnx', '_netware','_openbsd','_wdosx',
         '_palmos','_macos','_darwin','_emx','_watcom','_morphos','_netwlibc',
         '_win64','_wince','_gba','_nds','_embedded','_symbian','_nativent',
-        '_iphonesim'
+        '_iphonesim','_wii'
       );
 
       { This table is kept OS,Cpu because it is easier to maintain (PFV) }
@@ -136,7 +137,8 @@ interface
         { embedded }( true,  true,  true,  true,  true,  true,  true,  true,  true , false, false, false, false, false),
         { symbian } ( true,  false, false, false, false, true,  false, false, false, false, false, false, false, false),
         { nativent }( true,  false, false, false, false, false, false, false, false, false, false, false, false, false),
-        { iphonesim }( true,  false, false, false, false, false, false, false, false, false, false, false, false, false)        
+        { iphonesim }( true,  false, false, false, false, false, false, false, false, false, false, false, false, false),        
+        { wii }     ( false, false, true,  false, false, false, false, false, false, false, false, false, false, false)        
       );
 
     type
diff --git a/utils/fpcmkcfg/Makefile b/utils/fpcmkcfg/Makefile
index ed8b3b7504..60675318b2 100644
--- a/utils/fpcmkcfg/Makefile
+++ b/utils/fpcmkcfg/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/09/29]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/03/25]
 #
 default: all
-MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
+MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) solaris qnx haiku
 LIMIT83fs = go32v2 os2 emx watcom
@@ -375,6 +375,9 @@ endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
 override TARGET_PROGRAMS+=fpcmkcfg
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+override TARGET_PROGRAMS+=fpcmkcfg
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 override TARGET_PROGRAMS+=fpcmkcfg
 endif
@@ -799,6 +802,11 @@ ifeq ($(OS_TARGET),NativeNT)
 SHAREDLIBEXT=.dll
 SHORTSUFFIX=nativent
 endif
+ifeq ($(OS_TARGET),wii)
+EXEEXT=.dol
+SHAREDLIBEXT=.so
+SHORTSUFFIX=wii
+endif
 else
 ifeq ($(OS_TARGET),go32v1)
 PPUEXT=.pp1
@@ -1412,6 +1420,11 @@ REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-BASE=1
 REQUIRE_PACKAGES_FCL-PROCESS=1
 endif
+ifeq ($(FULL_TARGET),powerpc-wii)
+REQUIRE_PACKAGES_RTL=1
+REQUIRE_PACKAGES_FCL-BASE=1
+REQUIRE_PACKAGES_FCL-PROCESS=1
+endif
 ifeq ($(FULL_TARGET),sparc-linux)
 REQUIRE_PACKAGES_RTL=1
 REQUIRE_PACKAGES_FCL-BASE=1
@@ -2184,7 +2197,7 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
-fpcmkcfg$(EXEEXT): fpcmkcfg.pp fpccfg.inc fpcfg.inc fpini.inc
+fpcmkcfg$(EXEEXT): fpcmkcfg.pp fpccfg.inc fpcfg.inc fpini.inc fppkg.inc default.inc
 ifneq ($(DATA2INC),)
 fpccfg.inc: fpc.cft
 	$(DATA2INC) -b -s fpc.cft fpccfg.inc DefaultConfig
diff --git a/utils/fpcmkcfg/Makefile.fpc b/utils/fpcmkcfg/Makefile.fpc
index 5a18307e5d..f211736be9 100644
--- a/utils/fpcmkcfg/Makefile.fpc
+++ b/utils/fpcmkcfg/Makefile.fpc
@@ -29,7 +29,7 @@ build=n
 # due to overwriting each other's link.res file
 .NOTPARALLEL:
 
-fpcmkcfg$(EXEEXT): fpcmkcfg.pp fpccfg.inc fpcfg.inc fpini.inc
+fpcmkcfg$(EXEEXT): fpcmkcfg.pp fpccfg.inc fpcfg.inc fpini.inc fppkg.inc default.inc
 
 ifneq ($(DATA2INC),)
 fpccfg.inc: fpc.cft
diff --git a/utils/fpcmkcfg/default.cft b/utils/fpcmkcfg/default.cft
index 17a58e5ebf..cdaac120ed 100644
--- a/utils/fpcmkcfg/default.cft
+++ b/utils/fpcmkcfg/default.cft
@@ -1,8 +1,7 @@
 [Defaults]
 ConfigVersion=4
-GlobalInstallDir=%basepath%
-LocalInstallDir={LocalRepository}lib/%fpcversion%/
+GlobalPrefix=%GlobalPrefix%
+LocalPrefix={LocalRepository}
 Compiler=%fpcbin%
 OS=%fpctargetos%
 CPU=%fpctarget%
-Version=%fpcversion%
diff --git a/utils/fpcmkcfg/default.inc b/utils/fpcmkcfg/default.inc
index 33ad846110..da75ad6df5 100644
--- a/utils/fpcmkcfg/default.inc
+++ b/utils/fpcmkcfg/default.inc
@@ -5,10 +5,9 @@ const fppkg_default : array[0..0,1..240] of char=(
 {$endif Delphi}
   '[Defaults]'#010+
   'ConfigVersion=4'#010+
-  'GlobalInstallDir=%basepath%'#010+
-  'LocalInstallDir={LocalRepository}lib/%fpcversion%/'#010+
+  'GlobalPrefix=%GlobalPrefix%'#010+
+  'LocalPrefix={LocalRepository}'#010+
   'Compiler=%fpcbin%'#010+
   'OS=%fpctargetos%'#010+
-  'CPU=%fpctarget%'#010+
-  'Version=%fpcversion%'#010
+  'CPU=%fpctarget%'#010
 );
diff --git a/utils/fpcmkcfg/fpc.cft b/utils/fpcmkcfg/fpc.cft
index aec969a906..681514f179 100644
--- a/utils/fpcmkcfg/fpc.cft
+++ b/utils/fpcmkcfg/fpc.cft
@@ -29,11 +29,17 @@
 
 # For a debug version compile with debuginfo and all codegeneration checks on
 #IFDEF DEBUG
-  -glh
+  -gl
   -Crtoi
   #WRITE Compiling Debug Version
 #ENDIF
 
+# assembling
+#ifdef darwin
+# use pipes instead of temporary files for assembling
+-ap
+#endif
+
 # ----------------
 # Parsing switches
 # ----------------
@@ -62,17 +68,23 @@
 #      -Sc        supports operators like C (*=,+=,/= and -=)
 #      -Sa        include assertion code.
 #      -Sd        same as -Mdelphi
-#      -Se<x>     compiler stops after the <x> errors (default is 1)
+#      -Se<x>     error options. <x> is a combination of the following:
+#         <n> : compiler stops after <n> errors (default is 1)
+#         w   : compiler stops also after warnings
+#         n   : compiler stops also after notes
+#         h   : compiler stops also after hints
 #      -Sg        allow LABEL and GOTO
 #      -Sh        Use ansistrings
 #      -Si        support C++ styled INLINE
+#      -Sk        load fpcylix unit
 #      -SI<x>     set interface style to <x>
-#         -SIcomCOM compatible interface (default)
-#         -SIcorbaCORBA compatible interface
+#         -SIcom    COM compatible interface (default)
+#         -SIcorba  CORBA compatible interface
 #      -Sm        support macros like C (global)
 #      -So        same as -Mtp
 #      -Sp        same as -Mgpc
 #      -Ss        constructor name must be init (destructor must be done)
+#      -Sx        enable exception keywords (default in Delphi/ObjFPC modes)
 #
 # Allow goto, inline, C-operators, C-vars
 -Sgic
@@ -95,18 +107,22 @@
 #-Cr
 #-Ct
 
-# Optimizer switches for i386 compiler
+# Optimizer switches
 # -Os        generate smaller code
-# -O1        level 1 optimizations (quick optimizations)
-# -O2        level 2 optimizations (-O1 + slower optimizations)
-# -O3        level 3 optimizations (same as -O2u)
 # -Oa=N      set alignment to N
-# -OoX       switch on optimalization X. 
-# -OoNOX     switch off optimalization X.
-#               X is one of REGVAR UNCERTAIN STACKFRAME PEEPHOLE ASMCSE LOOPUNROLL
-# -OpCPU     set target processor.
-#             CPU is one of 386, PENTIUM, PENTIUM2, PENTIUM3, PENTIUM4, PENTIUMM 
-
+# -O1        level 1 optimizations (quick optimizations, debuggable)
+# -O2        level 2 optimizations (-O1 + optimizations which make debugging more difficult)
+# -O3        level 3 optimizations (-O2 + optimizations which also may make the program slower rather than faster)
+# -Oo<x>     switch on optimalization x. See fpc -i for possible values
+# -OoNO<x>   switch off optimalization x. See fpc -i for possible values
+# -Op<x>     set target cpu for optimizing, see fpc -i for possible values
+
+#ifdef darwin
+#ifdef cpui386
+-Cppentiumm
+-Oppentiumm
+#endif
+#endif
 
 # -----------------------
 # Set Filenames and Paths
@@ -123,20 +139,23 @@
 #-Fr%basepath%/msg/errorr.msg
 
 # searchpath for units and other system dependent things
--Fu%basepath%/units/$FPCTARGET/
--Fu%basepath%/units/$FPCTARGET/*
--Fu%basepath%/units/$FPCTARGET/rtl
+-Fu%basepath%/units/$fpctarget
+-Fu%basepath%/units/$fpctarget/*
+-Fu%basepath%/units/$fpctarget/rtl
 
-#IFDEF FPCAPACHE_1_13
--Fu%basepath%/units/$FPCTARGET/httpd13/
+#IFDEF FPCAPACHE_1_3
+-Fu%basepath%/units/$fpctarget/httpd13/
 #ELSE
 #IFDEF FPCAPACHE_2_0
--Fu%basepath%/units/$FPCTARGET/httpd20
+-Fu%basepath%/units/$fpctarget/httpd20
 #ELSE
--Fu%basepath%/units/$FPCTARGET/httpd22
+-Fu%basepath%/units/$fpctarget/httpd22
 #ENDIF
 #ENDIF
 
+# searchpath for fppkg user-specific packages
+-Fu%localbasepath%/units/$FPCTARGET/*
+
 # path to the gcclib
 %gcclibpath%
 
@@ -192,15 +211,16 @@
 #      e : Show errors (default)       d : Show debug info
 #      w : Show warnings               u : Show unit info
 #      n : Show notes                  t : Show tried/used files
-#      h : Show hints                  m : Show defined macros
-#      i : Show general info           p : Show compiled procedures
+#      h : Show hints                  s : Show time stamps
+#      i : Show general info           q : Show message numbers
 #      l : Show linenumbers            c : Show conditionals
 #      a : Show everything             0 : Show nothing (except errors)
-#      b : Show all procedure          r : Rhide/GCC compatibility mode
-#          declarations if an error    x : Executable info (Win32 only)
-#          occurs
+#      b : Write file names messages   r : Rhide/GCC compatibility mode
+#          with full path              x : Executable info (Win32 only)
+#      v : write fpcdebug.txt with     p : Write tree.log with parse tree
+#          lots of debugging info
 #
-# Display Info, Warnings, Notes and Hints
+# Display Info, Warnings and Notes
 -viwn
 # If you don't want so much verbosity use
 #-vw
diff --git a/utils/fpcmkcfg/fpccfg.inc b/utils/fpcmkcfg/fpccfg.inc
index 4a06799117..6d0f2ae532 100644
--- a/utils/fpcmkcfg/fpccfg.inc
+++ b/utils/fpcmkcfg/fpccfg.inc
@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const DefaultConfig : array[0..23] of string[240]=(
+const DefaultConfig : array[0..25] of string[240]=(
 {$else Delphi}
-const DefaultConfig : array[0..23,1..240] of char=(
+const DefaultConfig : array[0..25,1..240] of char=(
 {$endif Delphi}
   '#'#010+
   '# Config file generated by fpcmkcfg on %BUILDDATE% - %BUILDTIME%'#010+
@@ -36,59 +36,73 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '# For a debug version compile with debuginfo and all codegeneration ch'+
   'ecks on'#010+
   '#IFDEF DEBUG'#010+
-  '  -glh'#010+
+  '  -gl'#010+
   '  -Crtoi'#010+
-  '  #WRITE Compiling Debug Vers','ion'#010+
+  '  #WRITE Compiling Debug Versi','on'#010+
   '#ENDIF'#010+
   #010+
+  '# assembling'#010+
+  '#ifdef darwin'#010+
+  '# use pipes instead of temporary files for assembling'#010+
+  '-ap'#010+
+  '#endif'#010+
+  #010+
   '# ----------------'#010+
   '# Parsing switches'#010+
   '# ----------------'#010+
   #010+
   '# Pascal language mode'#010+
   '#      -Mfpc      free pascal dialect (default)'#010+
-  '#      -Mobjfpc   switch some Delphi 2 extensions on'#010+
-  '#      -Mdelphi   tries to be Delphi compatibl','e'#010+
+  '#      ','-Mobjfpc   switch some Delphi 2 extensions on'#010+
+  '#      -Mdelphi   tries to be Delphi compatible'#010+
   '#      -Mtp       tries to be TP/BP 7.0 compatible'#010+
   '#      -Mgpc      tries to be gpc compatible'#010+
-  '#      -Mmacpas   tries to be compatible to the macintosh pascal diale'+
-  'cts'#010+
+  '#      -Mmacpas   tries to be compatible to the ma','cintosh pascal dia'+
+  'lects'#010+
   '#'#010+
   '# Turn on Object Pascal extensions by default'#010+
   '#-Mobjfpc'#010+
   #010+
-  '# Assembl','er reader mode'#010+
+  '# Assembler reader mode'#010+
   '#      -Rdefault  use default assembler'#010+
   '#      -Ratt      read AT&T style assembler'#010+
   '#      -Rintel    read Intel style assembler'#010+
   '#'#010+
-  '# All assembler blocks are AT&T styled by default'#010+
+  '# ','All assembler blocks are AT&T styled by default'#010+
   '#-Ratt'#010+
   #010+
   '# Semantic checking'#010+
-  '#      -S2      ','  same as -Mobjfpc'#010+
+  '#      -S2        same as -Mobjfpc'#010+
   '#      -Sc        supports operators like C (*=,+=,/= and -=)'#010+
   '#      -Sa        include assertion code.'#010+
-  '#      -Sd        same as -Mdelphi'#010+
-  '#      -Se<x>     compiler stops after the <x> errors (default is 1)'#010+
-  '#      -Sg   ','     allow LABEL and GOTO'#010+
+  '#      -Sd        same as',' -Mdelphi'#010+
+  '#      -Se<x>     error options. <x> is a combination of the following'+
+  ':'#010+
+  '#         <n> : compiler stops after <n> errors (default is 1)'#010+
+  '#         w   : compiler stops also after warnings'#010+
+  '#         n   : compiler stops also after no','tes'#010+
+  '#         h   : compiler stops also after hints'#010+
+  '#      -Sg        allow LABEL and GOTO'#010+
   '#      -Sh        Use ansistrings'#010+
   '#      -Si        support C++ styled INLINE'#010+
-  '#      -SI<x>     set interface style to <x>'#010+
-  '#         -SIcomCOM compatible interface (default)'#010+
-  '#         -SIcorbaCORBA compatible inter','face'#010+
+  '#      -Sk        load fpcylix unit'#010+
+  '#      -SI<x>     set interface sty','le to <x>'#010+
+  '#         -SIcom    COM compatible interface (default)'#010+
+  '#         -SIcorba  CORBA compatible interface'#010+
   '#      -Sm        support macros like C (global)'#010+
   '#      -So        same as -Mtp'#010+
   '#      -Sp        same as -Mgpc'#010+
-  '#      -Ss        constructor name must be init (destructor must be do'+
-  'ne)'#010+
+  '#      -Ss      ','  constructor name must be init (destructor must be '+
+  'done)'#010+
+  '#      -Sx        enable exception keywords (default in Delphi/ObjFPC '+
+  'modes)'#010+
   '#'#010+
   '# Allow goto, inline, C-operators, C-vars'#010+
-  '-Sgic',#010+
+  '-Sgic'#010+
   #010+
   '# ---------------'#010+
   '# Code generation'#010+
-  '# ---------------'#010+
+  '# ---------------'#010,
   #010+
   '# Uncomment the next line if you always want static/dynamic units by d'+
   'efault'#010+
@@ -97,32 +111,40 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '#-CD'#010+
   #010+
   '# Set the default heapsize to 8Mb'#010+
-  '#-Ch800','0000'#010+
+  '#-Ch8000000'#010+
   #010+
-  '# Set default codegeneration checks (iocheck, overflow, range, stack)'#010+
+  '# Set default codegeneration checks (iocheck, over','flow, range, stack'+
+  ')'#010+
   '#-Ci'#010+
   '#-Co'#010+
   '#-Cr'#010+
   '#-Ct'#010+
   #010+
-  '# Optimizer switches for i386 compiler'#010+
+  '# Optimizer switches'#010+
   '# -Os        generate smaller code'#010+
-  '# -O1        level 1 optimizations (quick optimizations)'#010+
-  '# -O2       ',' level 2 optimizations (-O1 + slower optimizations)'#010+
-  '# -O3        level 3 optimizations (same as -O2u)'#010+
   '# -Oa=N      set alignment to N'#010+
-  '# -OoX       switch on optimalization X. '#010+
-  '# -OoNOX     switch off optimalization X.'#010+
-  '#               X is o','ne of REGVAR UNCERTAIN STACKFRAME PEEPHOLE ASM'+
-  'CSE LOOPUNROLL'#010+
-  '# -OpCPU     set target processor.'#010+
-  '#             CPU is one of 386, PENTIUM, PENTIUM2, PENTIUM3, PENTIUM4'+
-  ', PENTIUMM '#010+
-  #010+
-  #010+
-  '# -----------------------'#010+
+  '# -O1        level 1 optimizations (quick optimizations, debuggable)'#010+
+  '# -O2        level 2 optimizations (-O1 + ','optimizations which make d'+
+  'ebugging more difficult)'#010+
+  '# -O3        level 3 optimizations (-O2 + optimizations which also may'+
+  ' make the program slower rather than faster)'#010+
+  '# -Oo<x>     switch on optimalization x. See fpc -i for possible value'+
+  's'#010+
+  '# ','-OoNO<x>   switch off optimalization x. See fpc -i for possible va'+
+  'lues'#010+
+  '# -Op<x>     set target cpu for optimizing, see fpc -i for possible va'+
+  'lues'#010+
+  #010+
+  '#ifdef darwin'#010+
+  '#ifdef cpui386'#010+
+  '-Cppentiumm'#010+
+  '-Oppentiumm'#010+
+  '#endif'#010+
+  '#endif'#010+
+  #010+
+  '# -----------------------',#010+
   '# Set Filenames and Paths'#010+
-  '# ------','-----------------'#010+
+  '# -----------------------'#010+
   #010+
   '# Both slashes and backslashes are allowed in paths'#010+
   #010+
@@ -130,43 +152,46 @@ const DefaultConfig : array[0..23,1..240] of char=(
   'erride'#010+
   '# the default language'#010+
   '#-Fr%basepath%/msg/errore.msg'#010+
-  '#-Fr%basepath%/msg/errorn.msg'#010+
-  '#-Fr%bas','epath%/msg/errores.msg'#010+
+  '#-F','r%basepath%/msg/errorn.msg'#010+
+  '#-Fr%basepath%/msg/errores.msg'#010+
   '#-Fr%basepath%/msg/errord.msg'#010+
   '#-Fr%basepath%/msg/errorr.msg'#010+
   #010+
   '# searchpath for units and other system dependent things'#010+
-  '-Fu%basepath%/units/$FPCTARGET/'#010+
-  '-Fu%basepath%/units/$FPCTARGET/*'#010+
-  '-Fu%basepath%/units/$FPCTARGET/rtl',#010+
+  '-Fu%basepath%/units/$fpctarget'#010+
+  '-Fu%basepath%/units/$fpctarget/*'#010,
+  '-Fu%basepath%/units/$fpctarget/rtl'#010+
   #010+
-  '#IFDEF FPCAPACHE_1_13'#010+
-  '-Fu%basepath%/units/$FPCTARGET/httpd13/'#010+
+  '#IFDEF FPCAPACHE_1_3'#010+
+  '-Fu%basepath%/units/$fpctarget/httpd13/'#010+
   '#ELSE'#010+
   '#IFDEF FPCAPACHE_2_0'#010+
-  '-Fu%basepath%/units/$FPCTARGET/httpd20'#010+
+  '-Fu%basepath%/units/$fpctarget/httpd20'#010+
   '#ELSE'#010+
-  '-Fu%basepath%/units/$FPCTARGET/httpd22'#010+
+  '-Fu%basepath%/units/$fpctarget/httpd22'#010+
   '#ENDIF'#010+
   '#ENDIF'#010+
   #010+
+  '# searchpath for ','fppkg user-specific packages'#010+
+  '-Fu%localbasepath%/units/$FPCTARGET/*'#010+
+  #010+
   '# path to the gcclib'#010+
   '%gcclibpath%'#010+
   #010+
-  '# searchpath fo','r libraries'#010+
+  '# searchpath for libraries'#010+
   '#-Fl%basepath%/lib'#010+
   '#-Fl/lib;/usr/lib'#010+
   #010+
   '# searchpath for tools'#010+
   '-FD%basepath%/bin/$FPCTARGET'#010+
   #010+
-  '%NEEDCROSSBINUTILSIFDEF%'#010+
+  '%NEEDCROSSBINUTILSI','FDEF%'#010+
   #010+
   '# binutils prefix for cross compiling'#010+
   '#IFDEF FPC_CROSSCOMPILING'#010+
   '#IFDEF NEEDCROSSBINUTILS'#010+
   '  -XP$FPCTARGET-'#010+
-  '#ENDI','F'#010+
+  '#ENDIF'#010+
   '#ENDIF'#010+
   #010+
   #010+
@@ -174,16 +199,17 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '# Linking'#010+
   '# -------------'#010+
   #010+
-  '# generate always debugging information for GDB (slows down the compil'+
-  'ing'#010+
+  '# generate always debugging information for GDB (slows down the comp','i'+
+  'ling'#010+
   '# process)'#010+
   '#      -gc        generate checks for pointers'#010+
   '#      -gd        use dbx'#010+
   '#      -gg        use gsym'#010+
-  '#','      -gh        use heap trace unit (for memory leak debugging)'#010+
-  '#      -gl        use line info unit to show more info for backtraces'#010+
+  '#      -gh        use heap trace unit (for memory leak debugging)'#010+
+  '#      -gl        use line info unit to show more info fo','r backtrace'+
+  's'#010+
   '#      -gv        generates programs tracable with valgrind'#010+
-  '#      -gw        generate dwarf debugging in','fo'#010+
+  '#      -gw        generate dwarf debugging info'#010+
   '#'#010+
   '# Enable debuginfo and use the line info unit by default'#010+
   '#-gl'#010+
@@ -191,7 +217,7 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '# always pass an option to the linker'#010+
   '#-k-s'#010+
   #010+
-  '# Always strip debuginfo from the executable'#010+
+  '# Always ','strip debuginfo from the executable'#010+
   '-Xs'#010+
   #010+
   #010+
@@ -199,26 +225,28 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '# Miscellaneous'#010+
   '# -------------'#010+
   #010+
-  '# Write always a nice FPC l','ogo ;)'#010+
+  '# Write always a nice FPC logo ;)'#010+
   '-l'#010+
   #010+
   '# Verbosity'#010+
   '#      e : Show errors (default)       d : Show debug info'#010+
-  '#      w : Show warnings               u : Show unit info'#010+
+  '#      w : Show warnings               u',' : Show unit info'#010+
   '#      n : Show notes                  t : Show tried/used files'#010+
-  '#      h : Show hints              ','    m : Show defined macros'#010+
-  '#      i : Show general info           p : Show compiled procedures'#010+
-  '#      l : Show linenumbers            c : Show conditionals'#010+
+  '#      h : Show hints                  s : Show time stamps'#010+
+  '#      i : Show general info           q : Show message numbers'#010+
+  '#      l : Show linenumbers      ','      c : Show conditionals'#010+
   '#      a : Show everything             0 : Show nothing (except errors'+
   ')'#010+
-  '#      b : ','Show all procedure          r : Rhide/GCC compatibility m'+
-  'ode'#010+
-  '#          declarations if an error    x : Executable info (Win32 only'+
-  ')'#010+
-  '#          occurs'#010+
+  '#      b : Write file names messages   r : Rhide/GCC compatibility mod'+
+  'e'#010+
+  '#          with full path              x : Executable info (Win32 on','l'+
+  'y)'#010+
+  '#      v : write fpcdebug.txt with     p : Write tree.log with parse t'+
+  'ree'#010+
+  '#          lots of debugging info'#010+
   '#'#010+
-  '# Display Info, Warnings, Notes and Hints'#010+
+  '# Display Info, Warnings and Notes'#010+
   '-viwn'#010+
-  '# If you don'#039't want so much verbosity u','se'#010+
+  '# If you don'#039't want so much verbosity use'#010+
   '#-vw'#010
 );
diff --git a/utils/fpcmkcfg/fpcfg.inc b/utils/fpcmkcfg/fpcfg.inc
index 935c9c3f8d..571f574ce5 100644
--- a/utils/fpcmkcfg/fpcfg.inc
+++ b/utils/fpcmkcfg/fpcfg.inc
@@ -1,53 +1,50 @@
 {$ifdef Delphi}
-const fpcfg : array[0..3] of string[240]=(
+const fpcfg : array[0..2] of string[240]=(
 {$else Delphi}
-const fpcfg : array[0..3,1..240] of char=(
+const fpcfg : array[0..2,1..240] of char=(
 {$endif Delphi}
-  '#IFDEF NORMAL'#013#010+
-  ' -Ci'#013#010+
-  ' -XS'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -O1'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl'#013#010+
-  ' -g-'#013#010+
-  ' -p-'#013,#010+
-  ' -b-'#013#010+
-  '#ENDIF'#013#010+
-  #013#010+
-  '#IFDEF DEBUG'#013#010+
-  ' -Ci'#013#010+
-  ' -XS'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -Cr'#013#010+
-  ' -Co'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctarg','etos%\rtl'#013#010+
-  ' -g'#013#010+
-  ' -p-'#013#010+
-  ' -b-'#013#010+
-  '#ENDIF'#013#010+
-  #013#010+
-  '#IFDEF RELEASE'#013#010+
-  ' -XS'#013#010+
-  ' -T%fpctargetos%'#013#010+
-  ' -Sg'#013#010+
-  ' -O2'#013#010+
-  ' -Oppentium3'#013#010+
-  ' -Ratt'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%'#013#010+
-  ' -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*'#013#010+
-  ' -Fu%basepath%\units\%fpctarge','t%-%fpctargetos%\rtl'#013#010+
-  ' -g-'#013#010+
-  ' -p-'#013#010+
-  ' -b-'#013#010+
-  '#ENDIF'#013#010
+  '#IFDEF NORMAL'#010+
+  ' -Ci'#010+
+  ' -XS'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -O1'#010+
+  ' -Fu%basepath%\units\$fpctarget'#010+
+  ' -Fu%basepath%\units\$fpctarget\*'#010+
+  ' -Fu%basepath%\units\$fpctarget\rtl'#010+
+  '%GCCLIBPATH%'#010+
+  ' -g-'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010+
+  #010+
+  '#IFDEF DEBUG'#010+
+  ' -Ci'#010+
+  ' -XS'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -Cr'#010+
+  ' ','-Co'#010+
+  ' -Fu%basepath%\units\$fpctarget'#010+
+  ' -Fu%basepath%\units\$fpctarget\*'#010+
+  ' -Fu%basepath%\units\$fpctarget\rtl'#010+
+  '%GCCLIBPATH%'#010+
+  ' -g'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010+
+  #010+
+  '#IFDEF RELEASE'#010+
+  ' -XS'#010+
+  ' -T%fpctargetos%'#010+
+  ' -Sg'#010+
+  ' -O2'#010+
+  ' -Fu%basepath%\units\$fpctarget'#010+
+  ' -Fu%basepath%\units','\$fpctarget\*'#010+
+  ' -Fu%basepath%\units\$fpctarget\rtl'#010+
+  '%GCCLIBPATH%'#010+
+  ' -g-'#010+
+  ' -p-'#010+
+  ' -b-'#010+
+  '#ENDIF'#010
 );
diff --git a/utils/fpcmkcfg/fpcmkcfg.pp b/utils/fpcmkcfg/fpcmkcfg.pp
index c3db7676fe..7694c4dad5 100644
--- a/utils/fpcmkcfg/fpcmkcfg.pp
+++ b/utils/fpcmkcfg/fpcmkcfg.pp
@@ -16,7 +16,14 @@
  **********************************************************************}
 program fpcmkcfg;
 
-uses SysUtils,Classes,fpTemplate, process;
+uses
+  SysUtils,
+  Classes,
+{$ifdef unix}
+  baseunix,
+{$endif}
+  fpTemplate,
+  process;
 
 {
   The inc files must be built from a template with the data2inc
@@ -56,6 +63,8 @@ Resourcestring
 //  SUsage70  = '  -l filename   read name/value pairs from filename';
   SUsage70  = '  -m            show builtin macros and exit.';
   SUsage80  = '  -b            show builtin template and exit.';
+  SUsage84  = '  -s            skip the creation of a backup-file.';
+  SUsage87  = '  -p            force directory creation.';
   SUsage90  = '  -v            be verbose.';
   Susage100 = '  -0            use built in fpc.cfg template (default)';
   Susage110 = '  -1            use built in fp.cfg template';
@@ -66,22 +75,38 @@ Resourcestring
   SErrArgExpected     = 'Error: Option "%s" requires an argument.';
   SErrIncompletePair  = 'Error: Incomplete name-value pair "%s".';
   SErrNoSuchFile      = 'Error: File "%s" does not exist.';
+  SErrNoSuchDirectory = 'Error: Directory of file "%s" does not exists. User -p to force creation.';
   SErrBackupFailed    = 'Error: Backup of file "%s" to "%s" failed.';
   SErrDelBackupFailed = 'Error: Delete of old backup file "%s" failed.';
+  SErrCreateDirFailed = 'Error: Could not create the directory for file "%s".';
+
   SWarnIgnoringFile   = 'Warning: Ignoring non-existent file: ';
   SWarnIgnoringPair   = 'Warning: Ignoring wrong name/value pair: ';
   SWarngccNotFound    = 'Warning: Could not find gcc. Unable to determine the gcclib path.';
 
+  SBackupCreated      = 'Saved old "%s" to "%s"';
+
 
 Var
   Verbose : Boolean;
   SkipBackup : Boolean;
+  CreateDir: Boolean;
   Cfg : TStringList;
   TemplateParser: TTemplateParser;
   TemplateFileName,
   OutputFileName : String;
   IDEBuildin : Integer;
 
+function IsSuperUser:boolean;
+begin
+{$ifdef unix}
+  result:=(fpGetUID=0);
+{$else unix}
+  result:=false;
+{$endif unix}
+end;
+
+
 function GetDefaultLocalRepository: string;
 
 begin
@@ -92,6 +117,27 @@ begin
 {$ENDIF Unix}
 end;
 
+function GetDefaultLocalBasepath: string;
+
+begin
+{$IFDEF Unix}
+  result := '~/.fppkg'+PathDelim+'lib'+PathDelim+'fpc'+PathDelim+'$fpcversion';
+{$ELSE Unix}
+  result := '$LOCAL_APPDATA'+PathDelim+'FreePascal'+PathDelim+'fppkg';
+{$ENDIF Unix}
+end;
+
+function GetDefaultCompilerConfigDir: string;
+
+begin
+{$IFDEF Unix}
+  if IsSuperUser then
+    result := '/etc/fppkg/'
+  else
+{$ENDIF}
+  result := '{LocalRepository}config/';
+end;
+
 function GetDefaultNeedCrossBinutilsIfdef: string;
 
 begin
@@ -246,11 +292,14 @@ begin
   TemplateParser.Values['FPCVERSION'] := BuildVersion;
   TemplateParser.Values['FPCTARGET'] := BuildTarget;
   TemplateParser.Values['FPCTARGETOS'] := BuildOSTarget;
+  TemplateParser.Values['FPCBIN'] := 'fpc';
   TemplateParser.Values['PWD'] := GetCurrentDir;
   TemplateParser.Values['BUILDDATE'] := DateToStr(Date);
   TemplateParser.Values['BUILDTIME'] := TimeToStr(Time);
 
   TemplateParser.Values['LOCALREPOSITORY'] := GetDefaultLocalRepository;
+  TemplateParser.Values['LOCALBASEPATH'] := GetDefaultLocalBasepath;
+  TemplateParser.Values['COMPILERCONFIGDIR'] := GetDefaultCompilerConfigDir;
   TemplateParser.Values['NEEDCROSSBINUTILSIFDEF'] := GetDefaultNeedCrossBinutilsIfdef;
   TemplateParser.Values['GCCLIBPATH'] := GetDefaultGCCDIR;
 
@@ -277,6 +326,8 @@ begin
   Writeln(SUsage60);
   Writeln(SUsage70);
   Writeln(SUsage80);
+  Writeln(SUsage84);
+  Writeln(SUsage87);
   Writeln(SUsage90);
   Writeln(SUsage100);
   Writeln(SUsage110);
@@ -353,6 +404,9 @@ Var
 
 begin
   I:=1;
+  ShowBuiltinCommand := False;
+  SkipBackup := False;
+  CreateDir := False;
   While( I<=ParamCount) do
     begin
     S:=Paramstr(i);
@@ -372,6 +426,7 @@ begin
         'u' : TemplateParser.Values[GetOptArg]:='';
         'o' : OutputFileName:=GetoptArg;
         's' : SkipBackup:=True;
+        'p' : CreateDir:=True;
         '0' : IDEBuildin:=0;
         '1' : IDEBuildin:=1;
         '2' : IDEBuildin:=2;
@@ -437,6 +492,24 @@ begin
       begin
       Writeln(StdErr,Format(SErrBackupFailed,[OutputFileName,BFN]));
       Halt(1);
+      end
+    else
+      Writeln(Format(SBackupCreated,[ExtractFileName(OutputFileName),ExtractFileName(BFN)]));
+    end;
+  if (OutputFileName<>'') and not DirectoryExists(ExtractFilePath(OutputFileName)) then
+    begin
+    if CreateDir then
+      begin
+      if not ForceDirectories(ExtractFilePath(OutputFileName)) then
+        begin
+        Writeln(StdErr,Format(SErrCreateDirFailed,[OutputFileName]));
+        Halt(1);
+        end;
+      end
+    else
+      begin
+      Writeln(StdErr,Format(SErrNoSuchDirectory,[OutputFileName]));
+      Halt(1);
       end;
     end;
   Assign(Fout,OutputFileName);
diff --git a/utils/fpcmkcfg/fpinc.cfg b/utils/fpcmkcfg/fpinc.cfg
index 5ba8b875c3..f96db36889 100644
--- a/utils/fpcmkcfg/fpinc.cfg
+++ b/utils/fpcmkcfg/fpinc.cfg
@@ -4,11 +4,10 @@
  -T%fpctargetos%
  -Sg
  -O1
- -Oppentium3
- -Ratt
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -Fu%basepath%\units\$fpctarget
+ -Fu%basepath%\units\$fpctarget\*
+ -Fu%basepath%\units\$fpctarget\rtl
+%GCCLIBPATH%
  -g-
  -p-
  -b-
@@ -21,11 +20,10 @@
  -Sg
  -Cr
  -Co
- -Oppentium3
- -Ratt
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -Fu%basepath%\units\$fpctarget
+ -Fu%basepath%\units\$fpctarget\*
+ -Fu%basepath%\units\$fpctarget\rtl
+%GCCLIBPATH%
  -g
  -p-
  -b-
@@ -36,11 +34,10 @@
  -T%fpctargetos%
  -Sg
  -O2
- -Oppentium3
- -Ratt
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\*
- -Fu%basepath%\units\%fpctarget%-%fpctargetos%\rtl
+ -Fu%basepath%\units\$fpctarget
+ -Fu%basepath%\units\$fpctarget\*
+ -Fu%basepath%\units\$fpctarget\rtl
+%GCCLIBPATH%
  -g-
  -p-
  -b-
diff --git a/utils/fpcmkcfg/fppkg.cfg b/utils/fpcmkcfg/fppkg.cfg
index 870c574322..517f0fc7ad 100644
--- a/utils/fpcmkcfg/fppkg.cfg
+++ b/utils/fpcmkcfg/fppkg.cfg
@@ -3,7 +3,7 @@ ConfigVersion=4
 LocalRepository=%LocalRepository%
 BuildDir={LocalRepository}build/
 ArchivesDir={LocalRepository}archives/
-CompilerConfigDir={LocalRepository}config/
+CompilerConfigDir=%CompilerConfigDir%
 RemoteMirrors=http://www.freepascal.org/repository/mirrors.xml
 RemoteRepository=auto
 CompilerConfig=default
diff --git a/utils/fpcmkcfg/fppkg.inc b/utils/fpcmkcfg/fppkg.inc
index 01a76f4317..ebda2123bf 100644
--- a/utils/fpcmkcfg/fppkg.inc
+++ b/utils/fpcmkcfg/fppkg.inc
@@ -8,9 +8,9 @@ const fppkg : array[0..1,1..240] of char=(
   'LocalRepository=%LocalRepository%'#010+
   'BuildDir={LocalRepository}build/'#010+
   'ArchivesDir={LocalRepository}archives/'#010+
-  'CompilerConfigDir={LocalRepository}config/'#010+
+  'CompilerConfigDir=%CompilerConfigDir%'#010+
   'RemoteMirrors=http://www.freepascal.org/repository/mirrors.xml'#010+
-  'R','emoteRepository=auto'#010+
+  'Remote','Repository=auto'#010+
   'CompilerConfig=default'#010+
   'FPMakeCompilerConfig=default'#010+
   'Downloader=lnet'#010
diff --git a/utils/fpdoc/dglobals.pp b/utils/fpdoc/dglobals.pp
index 29b6bf8f54..e85689dce2 100644
--- a/utils/fpdoc/dglobals.pp
+++ b/utils/fpdoc/dglobals.pp
@@ -792,7 +792,7 @@ var
        end
      else
        if cls<>result then
-         writeln(cls.name,'''s dependancy '  ,clname,' could not be resolved');
+         writeln(cls.name,'''s dependency '  ,clname,' could not be resolved');
 end;
 
 function CreateAliasType (alname,clname : string;parentclass:TPasClassType; out cl2 :TPasClassType):TPasAliasType;
diff --git a/utils/fppkg/fprepos.pp b/utils/fppkg/fprepos.pp
index 4cafaee54e..1ace7ae5cc 100644
--- a/utils/fppkg/fprepos.pp
+++ b/utils/fppkg/fprepos.pp
@@ -37,7 +37,7 @@ Type
     linux,go32v2,win32,os2,freebsd,beos,netbsd,
     amiga,atari, solaris, qnx, netware, openbsd,wdosx,
     palmos,macos,darwin,emx,watcom,morphos,netwlibc,
-    win64,wince,gba,nds,embedded,symbian
+    win64,wince,gba,nds,embedded,symbian,haiku
   );
   TOSes = Set of TOS;
 
diff --git a/utils/fppkg/pkgoptions.pp b/utils/fppkg/pkgoptions.pp
index 54e10ad04a..d00ab7969c 100644
--- a/utils/fppkg/pkgoptions.pp
+++ b/utils/fppkg/pkgoptions.pp
@@ -331,8 +331,8 @@ procedure TGlobalOptions.LoadGlobalFromFile(const AFileName: String);
 Var
   Ini : TMemIniFile;
 begin
+  Ini:=TMemIniFile.Create(AFileName);
   try
-    Ini:=TMemIniFile.Create(AFileName);
     FConfigFileName:=AFileName;
     With Ini do
       begin
@@ -379,8 +379,8 @@ Var
 begin
   if FileExists(AFileName) then
     BackupFile(AFileName);
+  Ini:=TIniFile.Create(AFileName);
   try
-    Ini:=TIniFile.Create(AFileName);
     With Ini do
       begin
         WriteInteger(SDefaults,KeyConfigVersion,CurrentConfigVersion);
@@ -630,8 +630,8 @@ procedure TCompilerOptions.LoadCompilerFromFile(const AFileName: String);
 Var
   Ini : TMemIniFile;
 begin
+  Ini:=TMemIniFile.Create(AFileName);
   try
-    Ini:=TMemIniFile.Create(AFileName);
     FConfigFilename:=AFileName;
     With Ini do
       begin
@@ -664,8 +664,8 @@ Var
 begin
   if FileExists(AFileName) then
     BackupFile(AFileName);
+  Ini:=TIniFile.Create(AFileName);
   try
-    Ini:=TIniFile.Create(AFileName);
     With Ini do
       begin
         WriteInteger(SDefaults,KeyConfigVersion,CurrentConfigVersion);