diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index 3838db08c4..740b4aeb22 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1,1298 +1,1346 @@
 {$ifdef Delphi}
-const fpcmakeini : array[0..118] of string[240]=(
+const fpcmakeini : array[0..124] of string[240]=(
 {$else Delphi}
-const fpcmakeini : array[0..118,1..240] of char=(
+const fpcmakeini : array[0..124,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+
-  '[osdetect]'#010+
-  '#####################################################################'#010+
-  '# Autodetect OS (Linux or Dos or Windows NT or OS/2)'#010+
-  '# define inUnix when running under',' Unix (Linux,FreeBSD)'#010+
-  '# define inWinNT when running under WinNT'#010+
-  '# define inOS2 when running under OS/2'#010+
-  '#####################################################################'#010+
+  ';'#013#010+
+  #013#010+
+  '[osdetect]'#013#010+
+  '#####################################################################'#013+
+  #010+
+  '# Autodetect OS (Linux or Dos or Windows NT or OS/2)'#013#010+
+  '# define inUnix when runnin','g under Unix (Linux,FreeBSD)'#013#010+
+  '# define inWinNT when running under WinNT'#013#010+
+  '# define inOS2 when running under OS/2'#013#010+
+  '#####################################################################'#013+
+  #010+
+  #013#010+
+  '# We need only / in the path'#013#010+
+  'override PATH:=$(subst \',',/,$(PATH))'#013#010+
+  #013#010+
+  '# Search for PWD and determine also if we are under linux'#013#010+
+  'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(subst ;, ,$(PATH)))))'#013+
+  #010+
+  'ifeq ($(PWD),)'#013#010+
+  'PWD:=$(strip $(wildcard $(addsuffix /pwd,$(subst :, ,$(PATH)))))'#013#010+
+  'ifeq ($(PWD),)',#013#010+
+  'nopwd:'#013#010+
+  '        @echo You need the GNU utils package to use this Makefile!'#013+
   #010+
-  '# We need only / in the path'#010+
-  'override PATH:=$(subst \,/,$(PATH))'#010+
-  #010,
-  '# Search for PWD and determine also if we are under linux'#010+
-  'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(subst ;, ,$(PATH)))))'#010+
-  'ifeq ($(PWD),)'#010+
-  'PWD:=$(strip $(wildcard $(addsuffix /pwd,$(subst :, ,$(PATH)))))'#010+
-  'ifeq ($(PWD),)'#010+
-  'nopwd:'#010+
-  '        @ec','ho You need the GNU utils package to use this Makefile!'#010+
   '        @echo Get ftp://ftp.freepascal.org/pub/fpc/dist/go32v2/utilgo3'+
-  '2.zip'#010+
-  '        @exit'#010+
-  'else'#010+
-  'inUnix=1'#010+
-  'PWD:=$(firstword $(PWD))'#010+
-  'endif'#010+
-  'else'#010+
-  'PWD:=$(firstword $(PWD))'#010+
-  'endif'#010+
+  '2.zip'#013#010+
+  '        @exit'#013#010+
+  'else'#013#010+
+  'inUnix=1'#013#010+
+  'PWD:=$(firstword $(PWD))'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'PWD:=$(firstwor','d $(PWD))'#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+
+  'endif'#013#010+
+  #013#010+
+  '# The extension of executables',#013#010+
+  'ifdef inUnix'#013#010+
+  'SRCEXEEXT='#013#010+
+  'else'#013#010+
+  'SRCEXEEXT=.exe'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# The extension of batch files / scripts'#013#010+
+  'ifdef inUnix'#013#010+
+  'BATCHEXT=.sh'#013#010+
+  'else'#013#010+
+  'ifdef inOS2'#013#010+
+  'BATCHEXT=.cmd'#013#010+
+  'else'#013#010+
+  'BATCHEXT=.bat'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Path Separator, the subst trick is nec','essary 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+
+  'endif'#013#010+
+  #013#010+
+  '# The path which is searched separated by spaces'#013#010+
+  'ifdef inUnix'#013#010+
+  'SEARCHPATH=$(subst :, ,$(PATH))'#013#010+
+  'else'#013#010+
+  'SEARCHPATH=$(','subst ;, ,$(PATH))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Base dir'#013#010+
+  'ifdef PWD'#013#010+
+  'BASEDIR:=$(shell $(PWD))'#013#010+
+  'else'#013#010+
+  'BASEDIR=.'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '[fpcdetect]'#013#010+
+  '#####################################################################'#013+
   #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+
-  'endif'#010+
+  '# FPC version/target Detection'#013#010+
+  '####################','################################################'+
+  '#'#013#010+
+  #013#010+
+  '# What compiler to use ?'#013#010+
+  'ifndef FPC'#013#010+
+  '# Compatibility with old makefiles'#013#010+
+  'ifdef PP'#013#010+
+  'FPC=$(PP)'#013#010+
+  'else'#013#010+
+  'FPC=ppc386'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'override FPC:=$(subst $(SRCEXEEXT),,$(FPC))'#013#010+
+  'override FPC:=$','(subst \,/,$(FPC))$(SRCEXEEXT)'#013#010+
+  #013#010+
+  '# Target OS'#013#010+
+  'ifndef OS_TARGET'#013#010+
+  'OS_TARGET:=$(shell $(FPC) -iTO)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Source OS'#013#010+
+  'ifndef OS_SOURCE'#013#010+
+  'OS_SOURCE:=$(shell $(FPC) -iSO)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Target CPU'#013#010+
+  'ifndef CPU_TARGET'#013#010+
+  'CPU_TARGET:=$(shell $(FPC) ','-iTP)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Source CPU'#013#010+
+  'ifndef CPU_SOURCE'#013#010+
+  'CPU_SOURCE:=$(shell $(FPC) -iSP)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# FPC version'#013#010+
+  'ifndef FPC_VERSION'#013#010+
+  'FPC_VERSION:=$(shell $(FPC) -iV)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION'#013#010+
+  #013#010+
+  #013#010,
+  '[fpcdircheckenv]'#013#010+
+  '#####################################################################'#013+
   #010+
-  '# The extension of executables'#010+
-  'ifdef inUnix'#010+
-  'SRCEXEEXT='#010+
-  'else'#010+
-  'SRCEXEEXT=.exe',#010+
-  'endif'#010+
+  '# FPCDIR Setting'#013#010+
+  '#####################################################################'#013+
   #010+
-  '# The extension of batch files / scripts'#010+
-  'ifdef inUnix'#010+
-  'BATCHEXT=.sh'#010+
-  'else'#010+
-  'ifdef inOS2'#010+
-  'BATCHEXT=.cmd'#010+
-  'else'#010+
-  'BATCHEXT=.bat'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Path Separator, the subst trick is necessary for the \ that can'#039't'+
-  ' exists'#010+
-  '# at the end of a line'#010+
-  'ifde','f inUnix'#010+
-  'PATHSEP=/'#010+
-  'else'#010+
-  'PATHSEP=$(subst /,\,/)'#010+
-  'endif'#010+
-  #010+
-  '# The path which is searched separated by spaces'#010+
-  'ifdef inUnix'#010+
-  'SEARCHPATH=$(subst :, ,$(PATH))'#010+
-  'else'#010+
-  'SEARCHPATH=$(subst ;, ,$(PATH))'#010+
-  'endif'#010+
-  #010+
-  '# Base dir'#010+
-  'ifdef PWD'#010+
-  'BASEDIR:=$(shell $(PWD))'#010+
-  'el','se'#010+
-  'BASEDIR=.'#010+
-  'endif'#010+
-  #010+
-  '[fpcdetect]'#010+
-  '#####################################################################'#010+
-  '# FPC version/target Detection'#010+
-  '#####################################################################'#010+
-  #010+
-  '# What compiler to use ?'#010+
-  'ifndef FPC'#010,
-  '# Compatibility with old makefiles'#010+
-  'ifdef PP'#010+
-  'FPC=$(PP)'#010+
-  'else'#010+
-  'FPC=ppc386'#010+
-  'endif'#010+
-  'endif'#010+
-  'override FPC:=$(subst $(SRCEXEEXT),,$(FPC))'#010+
-  'override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)'#010+
-  #010+
-  '# Target OS'#010+
-  'ifndef OS_TARGET'#010+
-  'OS_TARGET:=$(shell $(FPC) -iTO)'#010+
-  'endif'#010,
-  #010+
-  '# Source OS'#010+
-  'ifndef OS_SOURCE'#010+
-  'OS_SOURCE:=$(shell $(FPC) -iSO)'#010+
-  'endif'#010+
-  #010+
-  '# Target CPU'#010+
-  'ifndef CPU_TARGET'#010+
-  'CPU_TARGET:=$(shell $(FPC) -iTP)'#010+
-  'endif'#010+
-  #010+
-  '# Source CPU'#010+
-  'ifndef CPU_SOURCE'#010+
-  'CPU_SOURCE:=$(shell $(FPC) -iSP)'#010+
-  'endif'#010+
-  #010+
-  '# FPC version'#010+
-  'ifndef FPC_VERS','ION'#010+
-  'FPC_VERSION:=$(shell $(FPC) -iV)'#010+
-  'endif'#010+
-  #010+
-  'export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION'#010+
-  #010+
-  #010+
-  '[fpcdircheckenv]'#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 $(FPCDIR)/rtl),)'#010+
-  'ifeq ($(wildcard $(FPCDIR)/units),)'#010+
-  'override FPCDIR=wrong'#010+
-  'endif',#010+
-  'endif'#010+
-  'else'#010+
-  'override FPCDIR=wrong'#010+
-  'endif'#010+
-  #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+
-  'e','ndif'#010+
-  'else'#010+
+  #013#010+
+  '# Test FPCDIR to look if the RTL dir exists'#013#010+
+  'ifdef FPCDIR'#013#010+
+  'o','verride FPCDIR:=$(subst \,/,$(FPCDIR))'#013#010+
+  'ifeq ($(wildcard $(FPCDIR)/rtl),)'#013#010+
+  'ifeq ($(wildcard $(FPCDIR)/units),)'#013#010+
+  'override FPCDIR=wrong'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'override FPCDIR=wrong'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[fpcdirdetect]'#013#010+
+  '# Detect FPCDIR'#013#010+
+  'ifeq ($(FPCDIR),wr','ong)'#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),,$(firstword $(strip $(wildcard $(add'+
-  'suffix /$(FPC),$(SEARCHPATH))))))'#010+
-  'override FPCDIR:=$(FPCDIR)/..'#010+
-  'ifeq ($(wildcard $(FPCDIR)/rtl),)'#010+
-  'ifeq ($(wildcard $(FPCDIR)/units),)'#010+
-  'override FPCDIR:=$(FPCDIR)','/..'#010+
-  'ifeq ($(wildcard $(FPCDIR)/rtl),)'#010+
-  'ifeq ($(wildcard $(FPCDIR)/units),)'#010+
-  'override FPCDIR=c:/pp'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
-  'endif'#010+
+  'suff','ix /$(FPC),$(SEARCHPATH))))))'#013#010+
+  'override FPCDIR:=$(FPCDIR)/..'#013#010+
+  'ifeq ($(wildcard $(FPCDIR)/rtl),)'#013#010+
+  'ifeq ($(wildcard $(FPCDIR)/units),)'#013#010+
+  'override FPCDIR:=$(FPCDIR)/..'#013#010+
+  'ifeq ($(wildcard $(FPCDIR)/rtl),)'#013#010+
+  'ifeq ($(wildcard $(FPCDIR)/units),)'#013#010+
+  'ove','rride FPCDIR=c:/pp'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Units dir'#013#010+
+  'UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#013#010+
+  #013#010+
+  '# Packages dir'#013#010+
+  'PACKAGESDIR=$(wildcard $(FPCDIR) $(FPCDIR)/packages)'#013#010+
+  #013#010+
+  #013#010+
+  '[shelltools]'#013#010+
+  '######################','##############################################'+
+  '#'#013#010+
+  '# Shell tools'#013#010+
+  '#####################################################################'#013+
   #010+
-  '# Units dir'#010+
-  'UNITSDIR=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+
+  #013#010+
+  '# echo'#013#010+
+  'ifndef ECHO'#013#010+
+  'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))'#013+
   #010+
-  '# Packages dir'#010+
-  'PACKAGESDIR=$(wildcard $(FPCD','IR) $(FPCDIR)/packages)'#010+
-  #010+
-  #010+
-  '[shelltools]'#010+
-  '#####################################################################'#010+
-  '# Shell tools'#010+
-  '#####################################################################'#010+
-  #010+
-  '# echo'#010+
-  'ifndef ECHO'#010+
-  'ECHO:=$(strip $(wildcard $(','addsuffix /gecho$(EXEEXT),$(SEARCHPATH)))'+
-  ')'#010+
-  'ifeq ($(ECHO),)'#010+
+  'ifeq ($(ECH','O),)'#013#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,
+  ')'#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+
+  #013#010+
+  '# To copy pograms'#013#010+
+  'ifndef COPY'#013#010+
+  'COPY:=cp ','-fp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Copy a whole tree'#013#010+
+  'ifndef COPYTREE'#013#010+
+  'COPYTREE:=cp -rfp'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# To move pograms'#013#010+
+  'ifndef MOVE'#013#010+
+  'MOVE:=mv -f'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Check delete program'#013#010+
+  'ifndef DEL'#013#010+
+  'DEL:=rm -f'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Check deltree program'#013#010+
+  'ifndef DELTREE'#013#010+
+  'DELTREE:','=rm -rf'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# To install files'#013#010+
+  'ifndef INSTALL'#013#010+
+  'ifdef inUnix'#013#010+
+  'INSTALL:=install -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:=install -c -m 755'#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+
+  'ifdef inUnix'#013#010+
+  'MKDIR:=install -m 755 -d'#013#010+
+  'else'#013#010+
+  'MKDIR:=ginstall -m 755 -d'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR'#013+
   #010+
-  '# To copy pograms'#010+
-  'ifndef COPY'#010+
-  'COPY:=cp -fp'#010+
-  'endif'#010+
+  #013#010+
+  #013#010+
+  '[defaulttools]',#013#010+
+  '#####################################################################'#013+
   #010+
-  '# Copy a whole tree'#010+
-  'ifndef COPYTREE'#010+
-  'COPYTREE:=cp -rfp'#010+
-  'endif'#010+
+  '# Default Tools'#013#010+
+  '#####################################################################'#013+
   #010+
-  '# To move pograms'#010+
-  'ifndef MOVE'#010+
-  'MOVE:=mv -f'#010+
-  'endif'#010+
-  #010+
-  '# Check delete program'#010+
-  'ifndef DEL'#010+
-  'DEL:=rm -f'#010+
-  'endif'#010+
-  #010+
-  '# Check deltree program'#010+
-  'ifn','def DELTREE'#010+
-  'DELTREE:=rm -rf'#010+
-  'endif'#010+
-  #010+
-  '# To install files'#010+
-  'ifndef INSTALL'#010+
-  'ifdef inUnix'#010+
-  'INSTALL:=install -c -m 644'#010+
-  'else'#010+
-  'INSTALL:=$(COPY)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# To install programs'#010+
-  'ifndef INSTALLEXE'#010+
-  'ifdef inUnix'#010+
-  'INSTALLEXE:=install -c -m 755'#010+
-  'else'#010+
-  'INSTALLE','XE:=$(COPY)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# To make a directory.'#010+
-  'ifndef MKDIR'#010+
-  'ifdef inUnix'#010+
-  'MKDIR:=install -m 755 -d'#010+
-  'else'#010+
-  'MKDIR:=ginstall -m 755 -d'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  'export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR'#010+
-  #010+
-  #010+
-  '[defaulttools]'#010+
-  '############','########################################################'+
-  '#'#010+
-  '# Default Tools'#010+
-  '#####################################################################'#010+
-  #010+
-  '# assembler, redefine it if cross compiling'#010+
-  'ifndef AS'#010+
-  'AS=as'#010+
-  'endif'#010+
-  #010+
-  '# linker, but probably not u','sed'#010+
-  'ifndef LD'#010+
-  'LD=ld'#010+
-  'endif'#010+
-  #010+
-  '# ppas.bat / ppas.sh'#010+
-  'PPAS=$(BATCHEXT)'#010+
-  #010+
-  '# ldconfig to rebuild .so cache'#010+
-  'ifdef inUnix'#010+
-  'LDCONFIG=ldconfig'#010+
-  'else'#010+
-  'LDCONFIG='#010+
-  'endif'#010+
-  #010+
-  '# ppumove'#010+
-  'ifndef PPUMOVE'#010+
-  'PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(S','EARC'+
-  'HPATH))))'#010+
-  'ifeq ($(PPUMOVE),)'#010+
-  'PPUMOVE='#010+
-  'else'#010+
-  'PPUMOVE:=$(firstword $(PPUMOVE))'#010+
-  'endif'#010+
-  'endif'#010+
-  'export PPUMOVE'#010+
-  #010+
-  '# ppufiles'#010+
-  'ifndef PPUFILES'#010+
-  'PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(SEARC'+
-  'HPATH))))'#010+
-  'ifeq ($(PPUFILES),)'#010+
-  'PPUFI','LES='#010+
-  'else'#010+
-  'PPUFILES:=$(firstword $(PPUFILES))'#010+
-  'endif'#010+
-  'endif'#010+
-  'export PPUFILES'#010+
-  #010+
-  '# gdate/date'#010+
-  'ifndef DATE'#010+
+  #013#010+
+  '# assembler, redefine it if cross compiling'#013#010+
+  'ifndef AS'#013#010+
+  'AS=as'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# lin','ker, but probably not used'#013#010+
+  'ifndef LD'#013#010+
+  'LD=ld'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# ppas.bat / ppas.sh'#013#010+
+  'PPAS=ppas$(BATCHEXT)'#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+
+  '# ppumove'#013#010+
+  'ifndef PPUMOVE'#013#010+
+  'PPUMOVE:=$(strip $(w','ildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARC'+
+  'HPATH))))'#013#010+
+  'ifeq ($(PPUMOVE),)'#013#010+
+  'PPUMOVE='#013#010+
+  'else'#013#010+
+  'PPUMOVE:=$(firstword $(PPUMOVE))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export PPUMOVE'#013#010+
+  #013#010+
+  '# ppufiles'#013#010+
+  'ifndef PPUFILES'#013#010+
+  'PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles','$(SRCEXEEXT),$(SEA'+
+  'RCHPATH))))'#013#010+
+  'ifeq ($(PPUFILES),)'#013#010+
+  'PPUFILES='#013#010+
+  'else'#013#010+
+  'PPUFILES:=$(firstword $(PPUFILES))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export PPUFILES'#013#010+
+  #013#010+
+  '# gdate/date'#013#010+
+  'ifndef DATE'#013#010+
   'DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH)))'+
-  ')'#010+
-  'ifeq ($(DATE),)'#010+
-  'DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEX','T),$(SEACHPATH)'+
-  ')))'#010+
-  'ifeq ($(DATE),)'#010+
-  'DATE='#010+
-  'else'#010+
-  'DATE:=$(firstword $(DATE))'#010+
-  'endif'#010+
-  'else'#010+
-  'DATE:=$(firstword $(DATE))'#010+
-  'endif'#010+
-  'endif'#010+
-  'export DATE'#010+
-  #010+
-  'ifdef DATE'#010+
-  'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+
-  'else'#010+
-  'DATESTR='#010+
-  'endif'#010+
-  #010+
-  '# Look if UPX is found for go32v2 and ','win32. We can'#039't use $UPX b'+
-  'ecuase'#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+
-  'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$','(SEARCHPAT'+
-  'H))))'#010+
-  'ifeq ($(UPXPROG),)'#010+
-  'UPXPROG='#010+
-  'else'#010+
-  'UPXPROG:=$(firstword $(UPXPROG))'#010+
-  'endif'#010+
-  'else'#010+
-  'UPXPROG='#010+
-  'endif'#010+
-  'endif'#010+
-  'export UPXPROG'#010+
-  #010+
-  '# ZipProg, you can'#039't use Zip as the var name (PFV)'#010+
-  'ifndef ZIPPROG'#010+
-  'ZIPPROG:=$(strip $(wildcard $(addsuffix /zip','$(SRCEXEEXT),$(SEARCHPAT'+
-  'H))))'#010+
-  'ifeq ($(ZIPPROG),)'#010+
-  'ZIPPROG='#010+
-  'else'#010+
-  'ZIPPROG:=$(firstword $(ZIPPROG))'#010+
-  'endif'#010+
-  'endif'#010+
-  'export ZIPPROG'#010+
-  #010+
-  'ZIPOPT=-9'#010+
-  'ZIPEXT=.zip'#010+
-  #010+
-  '# Tar'#010+
-  'ifndef TARPROG'#010+
+  ')'#013#010+
+  'if','eq ($(DATE),)'#013#010+
+  'DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH)))'+
+  ')'#013#010+
+  'ifeq ($(DATE),)'#013#010+
+  'DATE='#013#010+
+  'else'#013#010+
+  'DATE:=$(firstword $(DATE))'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  'DATE:=$(firstword $(DATE))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export DATE'#013#010+
+  #013#010+
+  'ifdef DATE'#013#010+
+  'DATESTR:=$(s','hell $(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'+
+  'uase'#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),win3','2)'#013#010+
+  'UPXPROG:=1'#013#010+
+  'endif'#013#010+
+  'ifdef UPXPROG'#013#010+
+  'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+
+  ')))'#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+
+  'export UPXPROG'#013#010+
+  #013#010+
+  '# ','ZipProg, you can'#039't use Zip as the var name (PFV)'#013#010+
+  'ifndef ZIPPROG'#013#010+
+  'ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)'+
+  ')))'#013#010+
+  'ifeq ($(ZIPPROG),)'#013#010+
+  'ZIPPROG='#013#010+
+  'else'#013#010+
+  'ZIPPROG:=$(firstword $(ZIPPROG))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export ZIPPROG'#013,#010+
+  #013#010+
+  'ZIPOPT=-9'#013#010+
+  'ZIPEXT=.zip'#013#010+
+  #013#010+
+  '# Tar'#013#010+
+  'ifndef TARPROG'#013#010+
   'TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH)'+
-  '))',')'#010+
-  'ifeq ($(TARPROG),)'#010+
-  'TARPROG='#010+
-  'else'#010+
-  'TARPROG:=$(firstword $(TARPROG))'#010+
-  'endif'#010+
-  'endif'#010+
-  'export TARPROG'#010+
+  ')))'#013#010+
+  'ifeq ($(TARPROG),)'#013#010+
+  'TARPROG='#013#010+
+  'else'#013#010+
+  'TARPROG:=$(firstword $(TARPROG))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export TARPROG'#013#010+
+  #013#010+
+  'ifeq ($(USE','TAR),bz2)'#013#010+
+  'TAROPT=vI'#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+
+  '[extensions]'#013#010+
+  '#####################################################################'#013+
   #010+
-  'ifeq ($(USETAR),bz2)'#010+
-  'TAROPT=vI'#010+
-  'TAREXT=.tar.bz2'#010+
-  'else'#010+
-  'TAROPT=vz'#010+
-  'TAREXT=.tar.gz'#010+
-  'endif'#010+
+  '# Default extensions'#013#010+
+  '##################################################','##################'+
+  '#'#013#010+
+  #013#010+
+  '# Default needed extensions (Go32v2,Linux)'#013#010+
+  'LOADEREXT=.as'#013#010+
+  'EXEEXT=.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+
+  'LIBPREFIX=lib'#013#010+
+  'RSTEXT=.rst'#013#010+
+  'FPCMADE=fpcmade'#013#010+
+  #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+
+  'LIBPREFIX='#013#010+
+  'FPCMADE=fpcmade.v1'#013#010+
+  'PACKAGESUFFIX=v1'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Go32v2'#013#010+
+  'ifeq ($(OS_TARGET),go32v2)'#013#010+
+  'LIBPREFIX='#013#010+
+  'FPCMADE','=fpcmade.dos'#013#010+
+  'ZIPSUFFIX=go32'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Linux'#013#010+
+  'ifeq ($(OS_TARGET),linux)'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'FPCMADE=fpcmade.lnx'#013#010+
+  'ZIPSUFFIX=linux'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Linux'#013#010+
+  'ifeq ($(OS_TARGET),freebsd)'#013#010+
+  'EXEEXT='#013#010+
+  'HASSHAREDLIB=1'#013#010+
+  'FPCMADE=fpcmade.freebsd'#013#010+
+  'ZIPSU','FFIX=freebsd'#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+
+  'FPCMADE=fpcmade.w32'#013#010+
+  'ZIPSUFFIX=w32'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# OS/2'#013#010+
+  'ifeq ($(OS_TARGET),os2)'#013#010+
+  'PPUEXT=.ppo'#013#010+
+  'ASM','EXT=.so2'#013#010+
+  'OEXT=.oo2'#013#010+
+  'AOUTEXT=.out'#013#010+
+  'SMARTEXT=.so'#013#010+
+  'STATICLIBEXT=.ao2'#013#010+
+  'SHAREDLIBEXT=.dll'#013#010+
+  'FPCMADE=fpcmade.os2'#013#010+
+  'ZIPSUFFIX=emx'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '[defaultdirs]'#013#010+
+  '#####################################################################'#013+
   #010+
+  '# Default Directories'#013,#010+
+  '#####################################################################'#013+
   #010+
-  '[extensions]'#010+
-  '##############################################','######################'+
-  '#'#010+
-  '# Default extensions'#010+
-  '#####################################################################'#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_PACKAGES','DIR)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '# Linux and freebsd use unix dirs with /usr/bin, /usr/lib'#013#010+
+  '# When zipping use the target as default, when normal install then'#013+
   #010+
-  '# Default needed extensions (Go32v2,Linux)'#010+
-  'LOADEREXT=.as'#010+
-  'EXEEXT=.exe'#010+
-  'PPLEXT=.ppl'#010+
-  'PPUEXT=.ppu'#010+
-  'OEXT=.o'#010+
-  'ASMEXT=.s'#010+
-  'SMARTEXT=.sl'#010,
-  'STATICLIBEXT=.a'#010+
-  'SHAREDLIBEXT=.so'#010+
-  'LIBPREFIX=lib'#010+
-  'RSTEXT=.rst'#010+
-  'FPCMADE=fpcmade'#010+
+  '# use the source os as default'#013#010+
+  'ifdef ZIPINSTALL'#013#010+
+  '# Zipinstall'#013#010+
+  'ifeq ($(OS_TARGET),linux)'#013#010+
+  'UNIXI','NSTALLDIR=1'#013#010+
+  'endif'#013#010+
+  'ifeq ($(OS_TARGET),freebsd)'#013#010+
+  'UNIXINSTALLDIR=1'#013#010+
+  'endif'#013#010+
+  'else'#013#010+
+  '# Normal install'#013#010+
+  'ifeq ($(OS_SOURCE),linux)'#013#010+
+  'UNIXINSTALLDIR=1'#013#010+
+  'endif'#013#010+
+  'ifeq ($(OS_SOURCE),freebsd)'#013#010+
+  'UNIXINSTALLDIR=1'#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 UNIXINSTALLDIR'#013#010+
+  'INSTALL_PREFIX=/usr/local'#013#010+
+  'else'#013#010+
+  'INSTALL_PREFIX=/pp'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  'export INSTALL_PREFIX'#013#010+
+  #013#010+
+  '# Where to place the resulting zip files'#013#010+
+  'ifndef DIST_DESTDIR'#013#010+
+  'DIST_DESTDI','R:=$(BASEDIR)'#013#010+
+  'endif'#013#010+
+  'export DIST_DESTDIR'#013#010+
+  #013#010+
+  #013#010+
+  '#####################################################################'#013+
   #010+
+  '# Install Directories'#013#010+
+  '#####################################################################'#013+
   #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+
-  'LIBPREFIX='#010+
-  'FPCMADE=fpcmade.v1'#010+
-  'PACKAGESUFFIX=v1',#010+
-  'endif'#010+
-  #010+
-  '# Go32v2'#010+
-  'ifeq ($(OS_TARGET),go32v2)'#010+
-  'LIBPREFIX='#010+
-  'FPCMADE=fpcmade.dos'#010+
-  'ZIPSUFFIX=go32'#010+
-  'endif'#010+
-  #010+
-  '# Linux'#010+
-  'ifeq ($(OS_TARGET),linux)'#010+
-  'EXEEXT='#010+
-  'HASSHAREDLIB=1'#010+
-  'FPCMADE=fpcmade.lnx'#010+
-  'ZIPSUFFIX=linux'#010+
-  'endif'#010+
-  #010+
-  '# Linux'#010+
-  'ifeq ($(OS_TARGET),freebsd)'#010+
-  'EXEEXT=',#010+
-  'HASSHAREDLIB=1'#010+
-  'FPCMADE=fpcmade.freebsd'#010+
-  'ZIPSUFFIX=freebsd'#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+
-  'SHAREDLIBEXT=.dll'#010+
-  'FPCMADE=fpcmade.w32'#010+
-  'ZIPSUFFIX=w32'#010+
-  'endif'#010+
-  #010+
-  '# OS/2'#010+
-  'ifeq ($(OS_T','ARGET),os2)'#010+
-  'PPUEXT=.ppo'#010+
-  'ASMEXT=.so2'#010+
-  'OEXT=.oo2'#010+
-  'SMARTEXT=.so'#010+
-  'STATICLIBEXT=.ao2'#010+
-  'SHAREDLIBEXT=.dll'#010+
-  'FPCMADE=fpcmade.os2'#010+
-  'ZIPSUFFIX=emx'#010+
-  'endif'#010+
-  #010+
-  '[defaultdirs]'#010+
-  '#####################################################################'#010+
-  '# Default Directorie','s'#010+
-  '#####################################################################'#010+
-  #010+
-  '# Units dir'#010+
-  'ifdef REQUIRE_UNITSDIR'#010+
-  'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+
-  'endif'#010+
-  #010+
-  '# Units dir'#010+
-  'ifdef REQUIRE_PACKAGESDIR'#010+
-  'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+
-  'end','if'#010+
-  #010+
-  #010+
-  '# Linux and freebsd use unix dirs with /usr/bin, /usr/lib'#010+
-  '# When zipping use the target as default, when normal install then'#010+
-  '# use the source os as default'#010+
-  'ifdef ZIPINSTALL'#010+
-  '# Zipinstall'#010+
-  'ifeq ($(OS_TARGET),linux)'#010+
-  'UNIXINSTALLDIR=1'#010+
-  'endif'#010,
-  'ifeq ($(OS_TARGET),freebsd)'#010+
-  'UNIXINSTALLDIR=1'#010+
-  'endif'#010+
-  'else'#010+
-  '# Normal install'#010+
-  'ifeq ($(OS_SOURCE),linux)'#010+
-  'UNIXINSTALLDIR=1'#010+
-  'endif'#010+
-  'ifeq ($(OS_SOURCE),freebsd)'#010+
-  'UNIXINSTALLDIR=1'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# set the prefix directory where to install everything'#010+
-  'ifnde','f INSTALL_PREFIX'#010+
-  'ifdef UNIXINSTALLDIR'#010+
-  'INSTALL_PREFIX=/usr/local'#010+
-  'else'#010+
-  'INSTALL_PREFIX=/pp'#010+
-  'endif'#010+
-  'endif'#010+
-  'export INSTALL_PREFIX'#010+
-  #010+
-  '# Where to place the resulting zip files'#010+
-  'ifndef DIST_DESTDIR'#010+
-  'DIST_DESTDIR:=$(BASEDIR)'#010+
-  'endif'#010+
-  'export DIST_DESTDIR'#010+
-  #010+
-  #010+
-  '###','#################################################################'+
-  '#'#010+
-  '# Install Directories'#010+
-  '#####################################################################'#010+
-  #010+
-  '# set the base directory where to install everything'#010+
-  'ifndef INSTALL_BASEDIR'#010+
-  'ifde','f UNIXINSTALLDIR'#010+
-  'INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#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 UNIXINSTALLDIR'#010+
-  'INSTALL_BINDIR=$(INST','ALL_PREFIX)/bin'#010+
-  'else'#010+
-  'INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# set the directory where to install the units.'#010+
-  'ifndef INSTALL_UNITDIR'#010+
-  'INSTALL_UNITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)'#010+
-  'ifdef PACKAGE_NAME'#010+
-  'INSTALL_UNI','TDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where to install shared libraries'#010+
-  'ifndef INSTALL_LIBDIR'#010+
-  'ifdef UNIXINSTALLDIR'#010+
-  'INSTALL_LIBDIR=$(INSTALL_PREFIX)/lib'#010+
-  'else'#010+
-  'INSTALL_LIBDIR=$(INSTALL_UNITDIR)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where the source',' files will be stored'#010+
-  'ifndef INSTALL_SOURCEDIR'#010+
-  'ifdef UNIXINSTALLDIR'#010+
-  'INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)'#010+
-  'else'#010+
-  'INSTALL_SOURCEDIR=$(INSTALL_BASEDIR)/source'#010+
-  'endif'#010+
-  'ifdef PACKAGE_NAME'#010+
-  'INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)','/$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where the doc files will be stored'#010+
-  'ifndef INSTALL_DOCDIR'#010+
-  'ifdef UNIXINSTALLDIR'#010+
-  'INSTALL_DOCDIR=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)'#010+
-  'else'#010+
-  'INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where to install',' the examples, under linux we use the doc dir'#010+
-  '# because the copytree command will create a subdir itself'#010+
-  'ifndef INSTALL_EXAMPLEDIR'#010+
-  'ifdef UNIXINSTALLDIR'#010+
-  'INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples'#010+
-  'else'#010+
-  'INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)','/examples'#010+
-  'endif'#010+
-  'ifdef EXAMPLESUBDIR'#010+
-  'INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Where the some extra (data)files will be stored'#010+
-  'ifndef INSTALL_DATADIR'#010+
-  'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[dirlibc]'#010+
-  '# On l','inux, try to find where libgcc.a is.'#010+
-  'ifdef inUnix'#010+
-  'ifndef GCCLIBDIR'#010+
-  'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{ print'+
-  ' $$4 } '#039'`)'#010+
-  'endif'#010+
-  'ifndef OTHERLIBDIR'#010+
+  #013#010+
+  '# set the base directory w','here to install everything'#013#010+
+  'ifndef INSTALL_BASEDIR'#013#010+
+  'ifdef UNIXINSTALLDIR'#013#010+
+  'INSTALL_BASEDIR=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#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 UNIXINSTALLDIR'#013#010+
+  'INSTALL_BINDIR=$(INSTALL_PREFIX)/bin'#013#010+
+  'else'#013#010+
+  'INSTALL_BINDIR=$(INSTALL_BASEDIR)/bin/$(OS_TARGET)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# set the directory where to install the units.'#013#010+
+  'ifndef INSTALL_UNITDIR'#013#010+
+  'INSTALL_UN','ITDIR=$(INSTALL_BASEDIR)/units/$(OS_TARGET)'#013#010+
+  'ifdef PACKAGE_NAME'#013#010+
+  'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Where to install shared libraries'#013#010+
+  'ifndef INSTALL_LIBDIR'#013#010+
+  'ifdef UNIXINSTALLDIR'#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 UNIXINSTALLDIR'#013#010+
+  'INSTALL_SOURCEDIR=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)'#013#010+
+  'else'#013#010+
+  'INSTALL_SOURCE','DIR=$(INSTALL_BASEDIR)/source'#013#010+
+  'endif'#013#010+
+  'ifdef PACKAGE_NAME'#013#010+
+  'INSTALL_SOURCEDIR:=$(INSTALL_SOURCEDIR)/$(PACKAGE_NAME)'#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 UNIXINSTALLDIR'#013#010+
+  'INSTALL_DOCDIR=$(INSTALL_P','REFIX)/doc/fpc-$(FPC_VERSION)'#013#010+
+  'else'#013#010+
+  'INSTALL_DOCDIR=$(INSTALL_BASEDIR)/doc'#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 subdir itself'#013#010+
+  'ifndef INSTALL_EXAMPLED','IR'#013#010+
+  'ifdef UNIXINSTALLDIR'#013#010+
+  'INSTALL_EXAMPLEDIR=$(INSTALL_DOCDIR)/examples'#013#010+
+  'else'#013#010+
+  'INSTALL_EXAMPLEDIR=$(INSTALL_BASEDIR)/examples'#013#010+
+  'endif'#013#010+
+  'ifdef EXAMPLESUBDIR'#013#010+
+  'INSTALL_EXAMPLEDIR:=$(INSTALL_EXAMPLEDIR)/$(EXAMPLESUBDIR)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Where t','he 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+
+  #013#010+
+  '[dirlibc]'#013#010+
+  '# On linux, try to find where libgcc.a is.'#013#010+
+  'ifdef inUnix'#013#010+
+  'ifndef GCCLIBDIR'#013#010+
+  'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1',')| head -n 1| awk '#039'{ pri'+
+  'nt $$4 } '#039'`)'#013#010+
+  'endif'#013#010+
+  'ifndef OTHERLIBDIR'#013#010+
   'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+
-  '"; pr','int $1 }'#039')'#010+
-  'endif'#010+
-  'export GCCLIBDIR OTHERLIB'#010+
-  'endif'#010+
+  '"; print $1 }'#039')'#013#010+
+  'endif'#013#010+
+  'export GCCLIBDIR OTHERLIB'#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'#013#010+
+  'override FPCOPTDEF=$(CPU_TARGET)'#013#010+
+  #013#010+
+  '# Load commandl','ine 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+
+  '# 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 FPCOPT+=$(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 LINKSMA','RT'#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 (strip, optimize and don'#039't load ppc','386.cfg)'#013#010+
+  'ifdef RELEASE'#013#010+
+  'override FPCOPT+=-Xs -OG2p3 -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+=-OG2p3'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Verbose settings (warning,n','ote,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+
+  '# 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 TARGE','TDIRPREFIX=$(COMPILER_TARGETDIR)/'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Unit target dir'#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 UNITTARGETD','IRPREFIX=$(COMPILER_TARGETDIR)/'#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+
+  '[command_libc]'#013#010+
+  '# Add GCC lib path if asked'#013#010+
+  'ifd','ef 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+
+  'e','ndif'#013#010+
+  #013#010+
+  '# Add defines from FPCOPTDEF to FPCOPT'#013#010+
+  'ifdef FPCOPTDEF'#013#010+
+  'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#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+
+  '# For win32 the options are pass','ed using the environment FPCEXTCMD'#013+
   #010+
-  '[command_begin]'#010+
-  '#####################################################################'#010+
-  '# Compiler Command Line'#010+
-  '#####################################################################'#010+
+  'ifeq ($(OS_SOURCE),win32)'#013#010+
+  'override FPCEXTCMD:=$(FPCOPT)'#013#010+
+  'override FPCOPT:=!FPCEXTCMD'#013#010+
+  'export FPCEXTCMD'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Compiler commandline'#013#010+
+  'override COMPILER:=$(FPC) $(FPCOPT)'#013#010+
+  #013#010+
+  '# also call ppas if with co','mmand option -s'#013#010+
+  '# but only if the OS_SOURCE and OS_TARGET are equal'#013#010+
+  'ifeq (,$(findstring -s ,$(COMPILER)))'#013#010+
+  'EXECPPAS='#013#010+
+  'else'#013#010+
+  'ifeq ($(OS_SOURCE),$(OS_TARGET))'#013#010+
+  'EXECPPAS:=@$(PPAS)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[loaderrules]'#013#010+
+  '###########################','#########################################'+
+  '#'#013#010+
+  '# Loaders'#013#010+
+  '#####################################################################'#013+
   #010+
-  '# Load c','ommandline OPTDEF and add FPC_CPU define'#010+
-  'override FPCOPTDEF=$(CPU_TARGET)'#010+
+  #013#010+
+  '.PHONY: fpc_loaders'#013#010+
+  #013#010+
+  'ifdef 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+
+  'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '%$(OEXT): %$(LOADEREXT)'#013#010+
+  '        $(AS) -o $*$(OEXT) $<'#013#010+
+  #013#010+
+  'fpc_loaders: $(LOADEROFILES)'#013#010+
+  #013#010+
+  'fpc_loaders_clean:'#013#010+
+  '    ','    -$(DEL) $(LOADEROFILES)'#013#010+
+  #013#010+
+  'fpc_loaders_install:'#013#010+
+  '        $(MKDIR) $(INSTALL_UNITDIR)'#013#010+
+  '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#013#010+
+  #013#010+
+  #013#010+
+  '[unitrules]'#013#010+
+  '#####################################################################'#013+
   #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+
+  '# Units',#013#010+
+  '#####################################################################'#013+
   #010+
-  '# User dirs should be first, s','o 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+
-  'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
-  'endif'#010+
-  'ifdef INCDIR'#010+
-  'override ','FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
-  'endif'#010+
+  #013#010+
+  '.PHONY: fpc_units'#013#010+
+  #013#010+
+  'ifdef TARGET_UNITS'#013#010+
+  'override ALLTARGET+=fpc_units'#013#010+
+  #013#010+
+  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#013#010+
+  'override INSTALLPPUFILES+=$(U','NITPPUFILES)'#013#010+
+  'override CLEANPPUFILES+=$(UNITPPUFILES)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_units: $(UNITPPUFILES)'#013#010+
+  #013#010+
+  #013#010+
+  '[exerules]'#013#010+
+  '#####################################################################'#013+
   #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+
-  'en','dif'#010+
-  #010+
-  '# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+
-  'ifdef RELEASE'#010+
-  'override FPCOPT+=-Xs -OG2p3 -n'#010+
-  'override FPCOPTDEF+=RELEASE'#010+
-  'endif'#010+
-  #010+
-  '# Strip'#010+
-  'ifdef STRIP'#010+
-  'override FPCOPT+=-Xs'#010+
-  'endif'#010+
-  #010+
-  '# Optimizer'#010+
-  'ifdef OPTIMIZE'#010+
-  'override FPCOPT+=-OG2','p3'#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_UNITDIR'#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+
-  'endif'#010+
-  'ifdef COMPILER_INCLUDEDIR'#010+
-  'override F','PCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
-  'endif'#010+
-  #010+
-  '# Target dirs and the prefix to use for clean/install'#010+
-  'ifdef COMPILER_TARGETDIR'#010+
-  'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
-  'ifeq ($(COMPILER_TARGETDIR),.)'#010+
-  'override TARGETDIRPREFIX='#010+
-  'else'#010+
-  'ove','rride TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Unit target dir'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
-  'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
-  'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
-  'override UNITTARGETDIRPREFIX='#010+
-  'else'#010+
-  'override UNITTARGET','DIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
-  'endif'#010+
-  'else'#010+
-  'ifdef COMPILER_TARGETDIR'#010+
-  'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
-  'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '[command_libc]'#010+
-  '# Add GCC lib path if asked'#010+
-  'ifdef GCCLIBD','IR'#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+=$(OPT)'#010+
-  'endif'#010+
-  #010+
-  '# Add defines fr','om 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+
-  '# For win32 the options are passed using the environment FPCEXTCMD',#010+
-  'ifeq ($(OS_SOURCE),win32)'#010+
-  'override FPCEXTCMD:=$(FPCOPT)'#010+
-  'override FPCOPT:=!FPCEXTCMD'#010+
-  'export FPCEXTCMD'#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 OS_SOURCE ','and OS_TARGET are equal'#010+
-  'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
-  'EXECPPAS='#010+
-  'else'#010+
-  'ifeq ($(OS_SOURCE),$(OS_TARGET))'#010+
-  'EXECPPAS:=@$(PPAS)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[loaderrules]'#010+
-  '#####################################################################'#010+
-  '# Loaders'#010+
-  '###','#################################################################'+
-  '#'#010+
-  #010+
-  '.PHONY: fpc_loaders'#010+
-  #010+
-  'ifdef TARGET_LOADERS'#010+
-  'override ALLTARGET+=fpc_loaders'#010+
-  'override CLEANTARGET+=fpc_loaders_clean'#010+
-  'override INSTALLTARGET+=fpc_loaders_install'#010+
-  #010+
-  'override LOAD','EROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
-  'endif'#010+
-  #010+
-  '%$(OEXT): %$(LOADEREXT)'#010+
-  '        $(AS) -o $*$(OEXT) $<'#010+
-  #010+
-  'fpc_loaders: $(LOADEROFILES)'#010+
-  #010+
-  'fpc_loaders_clean:'#010+
-  '        -$(DEL) $(LOADEROFILES)'#010+
-  #010+
-  'fpc_loaders_install:'#010+
-  '        $(MKDIR) $(INSTALL','_UNITDIR)'#010+
-  '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
-  #010+
-  #010+
-  '[unitrules]'#010+
-  '#####################################################################'#010+
-  '# Units'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_u','nits'#010+
-  #010+
-  'ifdef TARGET_UNITS'#010+
-  'override ALLTARGET+=fpc_units'#010+
-  #010+
-  'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
-  'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
-  'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
-  'endif'#010+
-  #010+
-  'fpc_units: $(UNITPPUFILES)'#010+
-  #010+
-  #010+
-  '[exer','ules]'#010+
-  '#####################################################################'#010+
-  '# Exes'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_exes'#010+
-  #010+
-  'ifdef TARGET_PROGRAMS'#010+
-  'override EXEFILES=$(addsuffix $(EXEEXT),$(TARG','ET_PROGRAMS))'#010+
+  '# Exes'#013#010+
+  '#####################################################','###############'+
+  '#'#013#010+
+  #013#010+
+  '.PHONY: fpc_exes'#013#010+
+  #013#010+
+  'ifdef TARGET_PROGRAMS'#013#010+
+  'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#013#010+
   'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
-  'x $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+
+  'x $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(T','ARGET_PROGRAMS)))'#013#010+
+  #013#010+
+  'override ALLTARGET+=fpc_exes'#013#010+
+  'override INSTALLEXEFILES+=$(EXEFILES)'#013#010+
+  'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES) $(addsuffix $(AOUTEXT'+
+  '),$(TARGET_PROGRAMS))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_exes: $(EXEFILES)'#013#010+
+  #013#010+
+  #013#010+
+  '[rstrules]'#013#010+
+  '#########','###########################################################'+
+  '#'#013#010+
+  '# Resource strings'#013#010+
+  '#####################################################################'#013+
   #010+
-  'override ALLTARGET+=fpc_exes'#010+
-  'override INSTALLEXEFILES+=$(EXEFILES)'#010+
-  'override CLEANEXEFILES+=','$(EXEFILES) $(EXEOFILES)'#010+
-  'endif'#010+
+  #013#010+
+  'ifdef TARGET_RSTS'#013#010+
+  'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#013#010+
+  #013#010+
+  'overrid','e CLEANRSTFILES+=$(RSTFILES)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[examplerules]'#013#010+
+  '#####################################################################'#013+
   #010+
-  'fpc_exes: $(EXEFILES)'#010+
+  '# Examples'#013#010+
+  '#####################################################################'#013+
   #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 fpc_test'#010+
-  #010+
-  'ifdef TARGET_EXAMPLES'#010+
+  #013#010+
+  '.PHONY: fpc_examples fpc_te','st'#013#010+
+  #013#010+
+  'ifdef TARGET_EXAMPLES'#013#010+
   'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+
-  'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+
-  'override EXAMPLEFILES:=$(addsuffix $(EXE','EXT),$(TARGET_EXAMPLES))'#010+
-  'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
-  'refix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+
+  'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#013#010+
+  'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#013#010+
+  'override EXAMPLEOFILES:=$(adds','uffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+
+  'dprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#013+
   #010+
-  'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
-  'endif'#010+
+  #013#010+
+  'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EX','AMPLED'+
+  'IRS))'#013#010+
+  #013#010+
+  #013#010+
+  '[compilerules]'#013#010+
+  '#####################################################################'#013+
   #010+
-  'fpc_examples',': all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+
-  'IRS))'#010+
-  #010+
-  #010+
-  '[compilerules]'#010+
-  '#####################################################################'#010+
-  '# General compile rules'#010+
-  '###################################################################','#'+
-  '#'#010+
-  #010+
-  '.PHONY: fpc_packages fpc_all fpc_smart fpc_debug'#010+
-  #010+
-  '$(FPCMADE): $(ALLTARGET)'#010+
-  '        @$(ECHO) Compiled > $(FPCMADE)'#010+
-  #010+
-  'fpc_packages: $(COMPILEPACKAGES)'#010+
-  #010+
-  'fpc_all: fpc_packages $(FPCMADE)'#010+
-  #010+
-  'fpc_smart:'#010+
-  '        $(MAKE) all LINKSMART=1 CREATESMAR','T=1'#010+
-  #010+
-  'fpc_debug:'#010+
-  '        $(MAKE) all DEBUG=1'#010+
+  '# General compile rules'#013#010+
+  '#####################################################################'#013+
   #010+
+  #013#010+
+  '.PHONY: fpc_packages fpc_all fpc_smart',' fpc_debug'#013#010+
+  #013#010+
+  '$(FPCMADE): $(ALLTARGET)'#013#010+
+  '        @$(ECHO) Compiled > $(FPCMADE)'#013#010+
+  #013#010+
+  'fpc_packages: $(COMPILEPACKAGES)'#013#010+
+  #013#010+
+  'fpc_all: fpc_packages $(FPCMADE)'#013#010+
+  #013#010+
+  'fpc_smart:'#013#010+
+  '        $(MAKE) all LINKSMART=1 CREATESMART=1'#013#010+
+  #013#010+
+  'fpc_debug:'#013#010+
+  '        $(MAK','E) all DEBUG=1'#013#010+
+  #013#010+
   '# General compile rules, available for both possible .pp and .pas exte'+
-  'nsions'#010+
+  'nsions'#013#010+
+  #013#010+
+  '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#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+
+  '# Search paths for .ppu and .pp and .pas'#013#010+
+  'vpath %.pp $(COMPILER_SOURC','EDIR) $(COMPILER_INCLUDEDIR)'#013#010+
+  'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#013#010+
+  'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#013#010+
+  #013#010+
+  #013#010+
+  '[libraryrules]'#013#010+
+  '#####################################################################'#013+
   #010+
-  '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+
+  '# Library'#013#010+
+  '######','##############################################################'+
+  '#'#013#010+
+  #013#010+
+  '.PHONY: fpc_shared'#013#010+
+  #013#010+
+  'ifndef LIB_FULLNAME'#013#010+
+  'ifdef LIB_VERSION'#013#010+
+  'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#013#010+
+  'else'#013#010+
+  'LIB_FULLNAME=$(LIB_NAME)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# Default sharedlib un','its are all unit objects'#013#010+
+  'ifndef LIB_SHAREDUNITS'#013#010+
+  'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_shared: all'#013#010+
+  'ifdef HASSHAREDLIB'#013#010+
+  '        $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#013#010+
+  'else'#013#010+
+  '        @$(ECHO) Shared Libraries not supported',#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  '[installrules]'#013#010+
+  '#####################################################################'#013+
   #010+
-  '%$(PPUEXT): %.pp'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
+  '# Install rules'#013#010+
+  '#####################################################################'#013+
   #010+
-  '%$(PPUE','XT): %.pas'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
-  #010+
-  '%$(EXEEXT): %.pp'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
-  #010+
-  '%$(EXEEXT): %.pas'#010+
-  '        $(COMPILER) $<'#010+
-  '        $(EXECPPAS)'#010+
-  #010+
-  '# Search paths for .ppu and .pp and .pas'#010+
-  'vpath %.pp $(COMPILER','_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
-  #010+
-  #010+
-  '[libraryrules]'#010+
-  '#####################################################################'#010+
-  '# Library'#010+
-  '########','############################################################'+
-  '#'#010+
-  #010+
-  '.PHONY: fpc_shared'#010+
-  #010+
-  'ifndef LIB_FULLNAME'#010+
-  'ifdef LIB_VERSION'#010+
-  'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+
-  'else'#010+
-  'LIB_FULLNAME=$(LIB_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Default sharedlib units are all un','it objects'#010+
-  'ifndef LIB_SHAREDUNITS'#010+
-  'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+
-  'endif'#010+
-  #010+
-  'fpc_shared: all'#010+
-  'ifdef HASSHAREDLIB'#010+
-  '        $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+
-  'else'#010+
-  '        @$(ECHO) Shared Libraries not supported'#010+
-  'endif'#010+
-  #010+
-  #010+
-  '[installrules]',#010+
-  '#####################################################################'#010+
-  '# Install rules'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
-  #010+
-  'ifdef INSTALL_UNITS'#010+
-  'over','ride INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
-  'endif'#010+
-  #010+
-  'ifdef INSTALLPPUFILES'#010+
-  'ifdef PPUFILES'#010+
+  #013#010+
+  '.PHONY: fpc_install fpc_sourceinstall fpc_examplei','nstall'#013#010+
+  #013#010+
+  'ifdef INSTALL_UNITS'#013#010+
+  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef INSTALLPPUFILES'#013#010+
+  'ifdef PPUFILES'#013#010+
   'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
-  'PPUFILES))'#010+
-  'override INSTALLPPULINKFILES:=$(addprefix $(UNITTARGE','TDIRPREFIX),$(s'+
-  'hell $(PPUFILES) -S -O $(INSTALLPPUFILES)))'#010+
-  'else'#010+
+  'PPUFILES))'#013#010+
+  'override INS','TALLPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(s'+
+  'hell $(PPUFILES) -S -O $(INSTALLPPUFILES)))'#013#010+
+  'else'#013#010+
   'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
-  'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INS'+
-  'TALLPPUFILES)))'#010+
-  'override INSTALLPPUF','ILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTA'+
-  'LLPPUFILES))'#010+
+  'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT','),$(I'+
+  'NSTALLPPUFILES)))'#013#010+
+  'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+
+  'PPUFILES))'#013#010+
   'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
-  'EFIX),$(INSTALLPPULINKFILES)))'#010+
-  'endif'#010+
-  'endif'#010+
+  'EFIX),$(INSTALLPPULINKFILES)))'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'ifdef INSTALLEXE','FILES'#013#010+
+  'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEF'+
+  'ILES))'#013#010+
+  'endif'#013#010+
+  #013#010+
+  #013#010+
+  'fpc_install: $(INSTALLTARGET)'#013#010+
+  '# Create UnitInstallFiles'#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 INSTALLPPUFILES'#013#010+
+  '        $(MKDIR) $(INSTALL_UNITDIR)'#013#010+
+  '        $(INSTALL) $(INSTALLPPUFILES) $','(INSTALL_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_','LIBDIR)'#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_sourcei','nstall: 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 EXAMPLESOURCEFILES'#013#010+
+  '        $(MKDIR) $(INSTALL_EXAMPLE','DIR)'#013#010+
+  '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#013#010+
+  'endif'#013#010+
+  'ifdef TARGET_EXAMPLEDIRS'#013#010+
+  'ifndef EXAMPLESOURCEFILES'#013#010+
+  '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#013#010+
+  'endif'#013#010+
+  '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTAL','L_'+
+  'EXAMPLEDIR)'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_distinstall: fpc_install fpc_exampleinstall'#013#010+
+  #013#010+
+  #013#010+
+  '[zipinstallrules]'#013#010+
+  '#####################################################################'#013+
   #010+
-  'ifdef INSTALLEXEFILES'#010+
-  'override INSTALLEXEFILES:=$(addprefix $(TAR','GETDIRPREFIX),$(INSTALLEX'+
-  'EFILES))'#010+
-  'endif'#010+
+  '# Zip'#013#010+
+  '##################################################################','##'+
+  '#'#013#010+
+  #013#010+
+  '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#013#010+
+  #013#010+
+  '# Temporary path to pack a file'#013#010+
+  'ifndef PACKDIR'#013#010+
+  'ifndef inUnix'#013#010+
+  'PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)'#013#010+
+  'else'#013#010+
+  'PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)'#013#010+
+  'endif'#013#010,
+  'endif'#013#010+
+  #013#010+
+  '# Maybe create default zipname from packagename'#013#010+
+  'ifndef ZIPNAME'#013#010+
+  'ifdef DIST_ZIPNAME'#013#010+
+  'ZIPNAME=$(DIST_ZIPNAME)'#013#010+
+  'else'#013#010+
+  'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#013#010+
+  'endif'#013#010+
+  'endif'#013#010+
+  #013#010+
+  '# ZipTarget'#013#010+
+  'ifndef ZIPTARGET'#013#010+
+  'ifdef DIST_ZIPTARGE','T'#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+
+  'ifdef inOS2'#013#010+
+  'USEZIPWRAPPER=1'#013#010+
+  'endif'#013#010,
+  #013#010+
+  '# Create commands to create the zip/tar file'#013#010+
+  'ZIPWRAPPER=$(DIST_DESTDIR)/fpczip$(BATCHEXT)'#013#010+
+  'ZIPCMD_CDPACK:=cd $(subst /,$(PATHSEP),$(PACKDIR))'#013#010+
+  'ZIPCMD_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))'#013#010+
+  'ifdef USETAR'#013#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)','/$(ZIPNAME)$(TAREXT)'#013#010+
+  'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#013#010+
+  'else'#013#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#013#010+
+  'ZIPCMD_ZIP:=$(subst /,$(PATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFI'+
+  'LE) *'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_zipinstall:'#013#010+
+  '      ','  $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#013+
   #010+
+  '        $(DEL) $(ZIPDESTFILE)'#013#010+
+  'ifdef USEZIPWRAPPER'#013#010+
+  'ifneq ($(ECHO),echo)'#013#010+
+  '        $(ECHO) "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)'#013#010+
+  '        $(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)'#013#010+
+  ' ','       $(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)'#013#010+
+  'else'#013#010+
+  '        $(ECHO) $(ZIPCMD_CDPACK) > $(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+
+  '        $(ZIPWRAPPER)'#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_zipin','stall ZIPTARGET=sourceinstall ZIPSUFFIX=src'+
+  #013#010+
+  #013#010+
+  'fpc_zipexampleinstall:'#013#010+
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#013+
   #010+
-  'fpc_install: $(INSTALLTARGET)'#010+
-  '# Create UnitInstallFiles'#010+
-  'ifdef INSTALLEXEFILES'#010+
-  '        $(MKDIR) $(INSTALL_BINDIR)'#010+
-  '# Compress the exes if upx is defined'#010+
-  'ifdef UPXPROG'#010+
-  '        -$(UPXPROG) $(INSTALLEXEF','ILES)'#010+
-  'endif'#010+
-  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
-  'endif'#010+
-  'ifdef INSTALLPPUFILES'#010+
-  '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
-  '        $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
-  'ifneq ($(INSTALLPPULINKFILES),)'#010+
-  '        $(INSTAL','L) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
-  'endif'#010+
-  'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
-  '        $(MKDIR) $(INSTALL_LIBDIR)'#010+
-  '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#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+
+  #013#010+
+  'fpc_zipdistinstall:'#013#010+
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#013#010+
+  #013#010+
+  #013#010+
+  '[cleanrules]'#013#010+
+  '###','#################################################################'+
+  '#'#013#010+
+  '# Clean rules'#013#010+
+  '#####################################################################'#013+
   #010+
-  'fpc_sourceinstall: distclean'#010+
-  '        $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
-  '        $(COPYTREE) $(BASED','IR) $(INSTALL_SOURCEDIR)'#010+
-  #010+
-  'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
-  'ifdef EXAMPLESOURCEFILES'#010+
-  '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
-  '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
-  'endif'#010+
-  'ifdef TARGET_EXAMP','LEDIRS'#010+
-  'ifndef EXAMPLESOURCEFILES'#010+
-  '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
-  'endif'#010+
-  '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
-  'AMPLEDIR)'#010+
-  'endif'#010+
-  #010+
-  'fpc_distinstall: fpc_install fpc_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'#010+
-  'i','fndef PACKDIR'#010+
-  'ifndef inUnix'#010+
-  'PACKDIR=$(BASEDIR)/../pack_tmp/$(PACKAGE_NAME)'#010+
-  'else'#010+
-  'PACKDIR=/tmp/fpc-pack/$(PACKAGE_NAME)'#010+
-  'endif'#010+
-  'endif'#010+
-  #010+
-  '# Maybe create default zipname from packagename'#010+
-  'ifndef ZIPNAME'#010+
-  'ifdef DIST_ZIPNAME'#010+
-  'ZIPNAME=$(DIST_ZIPNAME)'#010+
-  'els','e'#010+
-  'ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)'#010+
-  'endif'#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+
-  'ifdef inOS2'#010+
-  'USEZIPWRAPPER=1'#010+
-  'endif'#010+
-  #010+
-  '# Create commands to create the zip/tar file'#010+
-  'ZIPWRAPPER=$(DIST_DESTDIR)/fpczip$(BATCHEXT)'#010+
-  'ZIPCMD_CDPACK:=cd $(subst /,$(PATHSEP),$(PACKDIR))'#010+
-  'ZIPCM','D_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))'#010+
-  'ifdef USETAR'#010+
-  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+
-  'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
-  'else'#010+
-  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+
-  'ZIPCMD_ZIP:=$(subst /,$(PA','THSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDEST'+
-  'FILE) *'#010+
-  'endif'#010+
-  #010+
-  'fpc_zipinstall:'#010+
-  '        $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
-  '        $(DEL) $(ZIPDESTFILE)'#010+
-  'ifdef USEZIPWRAPPER'#010+
-  'ifneq ($(ECHO),echo)'#010+
-  '        $(ECHO) "$(ZIPCMD_CD','PACK)" > $(ZIPWRAPPER)'#010+
-  '        $(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)'#010+
-  '        $(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)'#010+
-  'else'#010+
-  '        $(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
-  '        $(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
-  '        $(ECHO)',' $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
-  'endif'#010+
-  'ifdef inUnix'#010+
-  '        /bin/sh $(ZIPWRAPPER)'#010+
-  'else'#010+
-  '        $(ZIPWRAPPER)'#010+
-  'endif'#010+
-  '        $(DEL) $(ZIPWRAPPER)'#010+
-  'else'#010+
-  '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
-  'endif'#010+
-  '        $(DELTREE) $(PA','CKDIR)'#010+
-  #010+
-  'fpc_zipsourceinstall:'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+
-  #010+
-  'fpc_zipexampleinstall:'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm'#010+
-  #010+
-  'fpc_zipdistinstall:'#010+
-  '        $(MAKE) fpc_zipins','tall ZIPTARGET=distinstall'#010+
-  #010+
-  #010+
-  '[cleanrules]'#010+
-  '#####################################################################'#010+
-  '# Clean rules'#010+
-  '#####################################################################'#010+
-  #010+
-  '.PHONY: fpc_clean fpc_cleanall fpc_distclea','n'#010+
-  #010+
-  'ifdef EXEFILES'#010+
-  'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
-  '))'#010+
-  'endif'#010+
-  #010+
-  'ifdef CLEAN_UNITS'#010+
-  'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
-  'endif'#010+
-  #010+
-  'ifdef CLEANPPUFILES'#010+
-  'override CLEANPPUFILES:=$(addprefix',' $(UNITTARGETDIRPREFIX),$(CLEANPP'+
-  'UFILES))'#010+
-  '# Get the .o and .a files created for the units'#010+
-  'ifdef PPUFILES'#010+
-  'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
-  'else'#010+
+  #013#010+
+  '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#013#010+
+  #013#010+
+  'ifdef EXEFILES'#013#010+
+  'override CLEANEXEFIL','ES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+
+  'ES))'#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 CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEA','NPP'+
+  'UFILES))'#013#010+
+  '# Get the .o and .a files created for the units'#013#010+
+  'ifdef PPUFILES'#013#010+
+  'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#013#010+
+  'else'#013#010+
   'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
-  'S))',' $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLE'+
-  'ANPPUFILES))))'#010+
-  'endif'#010+
+  'S)) $(addprefix $(LIBPREFIX)',',$(subst $(PPUEXT),$(STATICLIBEXT),$(CLE'+
+  'ANPPUFILES))))'#013#010+
+  'endif'#013#010+
   'override CLEANPPULINKFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEAN'+
-  'PPULINKFILES))'#010+
-  'endif'#010+
+  'PPULINKFILES))'#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+
-  '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 $(UNITTARGETDIRPREFIX),$(CLEANRSTFILE','S))'+
-  #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+
+  'endi','f'#013#010+
+  'ifdef CLEAN_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) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
+  #013#010+
+  #013#010+
+  'fpc_distclean: fpc_clean'#013#010+
+  #013#010+
+  '# Also ru','n clean first if targetdir is set. Unittargetdir is always'#013+
   #010+
-  #010+
-  'fpc_distclean: fpc_clean'#010+
-  #010+
-  '# Also run c','lean first if targetdir is set. Unittargetdir is always'#010+
-  '# set if targetdir or unittargetdir is specified'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
-  'TARGETDIRCLEAN=fpc_clean'#010+
-  'endif'#010+
-  #010+
-  'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+
-  'ifdef CLEANEXEFILES'#010+
-  '       ',' -$(DEL) $(CLEANEXEFILES)'#010+
-  'endif'#010+
+  '# set if targetdir or unittargetdir is specified'#013#010+
+  'ifdef COMPILER_UNITTARGETDIR'#013#010+
+  'TARGETDIRCLEAN=fpc_clean'#013#010+
+  'endif'#013#010+
+  #013#010+
+  'fpc_cleanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#013#010+
+  'ifdef CLEANEXEFIL','ES'#013#010+
+  '        -$(DEL) $(CLEANEXEFILES)'#013#010+
+  'endif'#013#010+
   '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
-  'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
-  '        -$(DELTREE) *$(SMARTEXT)'#010+
-  '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
+  'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#013#010+
+  '        -$(DELTREE) *$(SMARTEXT)'#013#010+
+  '        -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE)',' $(REDIRFIL'+
+  'E)'#013#010+
+  #013#010+
+  #013#010+
+  '[inforules]'#013#010+
+  '#####################################################################'#013+
   #010+
-  #010,
+  '# Info rules'#013#010+
+  '#####################################################################'#013+
   #010+
-  '[inforules]'#010+
-  '#####################################################################'#010+
-  '# Info rules'#010+
-  '#####################################################################'#010+
+  #013#010+
+  '.PHONY: fpc_info'#013#010+
+  #013#010+
+  'fpc_info:'#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+
+  '        @$(ECH','O)  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+
+  '        @$(ECHO)  Target O','S.... $(OS_TARGET)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  == Directory info =='#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  Basedir......... $(BASEDIR)'#013#010+
+  '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#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)  Pwd....... $(PWD)'#013#010+
+  '        @$(ECHO)  Echo...... $(ECHO)'#013#010+
+  '        @$(ECHO)  PPUMove... $(PPUMOVE)'#013#010+
+  '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#013#010+
+  '        @$(ECHO)  Date...... $(DATE)'#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 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....... $(INSTALL_FILES)'#013#010+
+  '  ','      @$(ECHO)'#013#010+
+  '        @$(ECHO)  == Install info =='#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  DateStr.............. $(DATESTR)'#013#010+
+  '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#013#010+
+  '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#013#010+
+  '        ','@$(ECHO)'#013#010+
+  '        @$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)'#013#010+
+  '        @$(ECHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)'#013#010+
+  '        @$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)'#013#010+
+  '        @$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UN','ITDIR)'#013#010+
+  '        @$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)'#013#010+
+  '        @$(ECHO)  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)'#013#010+
+  '        @$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)'#013#010+
+  '        @$(ECHO)'#013#010+
+  '        @$(ECHO)  DIST_DESTDIR...','...... $(DIST_DESTDIR)'#013#010+
+  '        @$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)'#013#010+
+  '        @$(ECHO)'#013#010+
+  #013#010+
+  '[localmakefile]'#013#010+
+  '#####################################################################'#013+
   #010+
-  '.PHONY: fpc_info'#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+
+  '[userrules]'#013#010+
+  '#####################################################################'#013+
   #010+
-  'fpc_info:'#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+
-  '        @$(ECHO)  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)'#010+
-  '  ','      @$(ECHO)  == Directory info =='#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
-  '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#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)  Pwd....... $(PWD)'#010+
-  '        @$(ECHO)  ','Echo...... $(ECHO)'#010+
-  '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
-  '        @$(ECHO)  PPUFiles.. $(PPUFILES)'#010+
-  '        @$(ECHO)  Date...... $(DATE)'#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 Programs..... $(TARGET_PROGRAMS)'#010+
-  '        @$(ECHO)  Targe','t 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)  C','lean 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)  ZipPrefix............ $(ZIPPREFIX)'#010+
-  '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  INSTALL_BASEDIR...... $(INSTALL_BASEDIR)'#010+
-  '        @$(E','CHO)  INSTALL_BINDIR....... $(INSTALL_BINDIR)'#010+
-  '        @$(ECHO)  INSTALL_LIBDIR....... $(INSTALL_LIBDIR)'#010+
-  '        @$(ECHO)  INSTALL_UNITDIR...... $(INSTALL_UNITDIR)'#010+
-  '        @$(ECHO)  INSTALL_SOURCEDIR.... $(INSTALL_SOURCEDIR)'#010+
-  '        @$(ECHO)','  INSTALL_DOCDIR....... $(INSTALL_DOCDIR)'#010+
-  '        @$(ECHO)  INSTALL_DATADIR...... $(INSTALL_DATADIR)'#010+
-  '        @$(ECHO)'#010+
-  '        @$(ECHO)  DIST_DESTDIR......... $(DIST_DESTDIR)'#010+
-  '        @$(ECHO)  DIST_ZIPNAME......... $(DIST_ZIPNAME)'#010+
-  '        @$','(ECHO)'#010+
-  #010+
-  '[localmakefile]'#010+
-  '#####################################################################'#010+
-  '# Local Makefile'#010+
-  '#####################################################################'#010+
-  #010+
-  'ifneq ($(wildcard fpcmake.loc),)'#010+
-  'include fpcmake.loc'#010+
-  'endif',#010+
-  #010+
-  '[userrules]'#010+
-  '#####################################################################'#010+
-  '# Users rules'#010+
-  '#####################################################################'#010
+  '# Users rules'#013#010+
+  '#####################################','###############################'+
+  '#'#013#010
 );
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index 117de8d54b..9be12f8744 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -267,7 +267,7 @@ LD=ld
 endif
 
 # ppas.bat / ppas.sh
-PPAS=$(BATCHEXT)
+PPAS=ppas$(BATCHEXT)
 
 # ldconfig to rebuild .so cache
 ifdef inUnix
@@ -449,6 +449,7 @@ ifeq ($(OS_TARGET),os2)
 PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
+AOUTEXT=.out
 SMARTEXT=.so
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
@@ -815,6 +816,9 @@ override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefix $(LIBPRE
 override ALLTARGET+=fpc_exes
 override INSTALLEXEFILES+=$(EXEFILES)
 override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
+ifeq ($(OS_TARGET),os2)
+override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))
+endif
 endif
 
 fpc_exes: $(EXEFILES)
@@ -845,6 +849,9 @@ override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
 
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
+ifeq ($(OS_TARGET),os2)
+override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
+endif
 endif
 
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
@@ -1153,6 +1160,9 @@ endif
         -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
         -$(DELTREE) *$(SMARTEXT)
         -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)
+ifdef AOUTEXT
+        -$(DEL) *$(AOUTEXT)
+endif
 
 
 [inforules]