diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index 269ba4cef8..31bdeefa8b 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const fpcmakeini : array[0..260] of string[240]=(
+const fpcmakeini : array[0..262] of string[240]=(
 {$else Delphi}
-const fpcmakeini : array[0..260,1..240] of char=(
+const fpcmakeini : array[0..262,1..240] of char=(
 {$endif Delphi}
   ';'#010+
   '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
@@ -900,98 +900,125 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '[dirlibc]'#010+
   '# On linux, t','ry to find where libgcc.a is.'#010+
   'ifeq ($(OS_SOURCE),linux)'#010+
-  #010+
-  '# Amd64 to i386?'#010+
   'ifndef GCCLIBDIR'#010+
+  '# Amd64 to i386?'#010+
   'ifeq ($(CPU_TARGET),i386)'#010+
   'ifneq ($(filter x86_64,$(shell uname -a)),)'#010+
   'ifeq ($(BINUTILSPREFIX),)'#010+
-  'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-fi','le-name`)'#010+
+  'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-fil','e-name`)'#010+
   'else'#010+
   'CROSSGCCOPT=-m32'#010+
   'endif'#010+
+  '#BINUTILSPREFIX'#010+
   'endif'#010+
+  '#filter x86_64'#010+
   'endif'#010+
+  '#CPU_TARGET=i386'#010+
   'ifeq ($(CPU_TARGET),powerpc)'#010+
   'ifeq ($(BINUTILSPREFIX),)'#010+
   'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+
   'else'#010+
   'CROSSGCCOPT=-m32'#010+
+  'end','if'#010+
+  '#BINUTILSPREFIX'#010+
   'endif'#010+
-  'endif'#010+
+  '#CPU_TARGET=powerpc'#010+
   'ifeq ($(CPU_TARGET),powerpc64)'#010+
-  'ifeq ($','(BINUTILSPREFIX),)'#010+
+  'ifeq ($(BINUTILSPREFIX),)'#010+
   'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#010+
   'else'#010+
   'CROSSGCCOPT=-m64'#010+
   'endif'#010+
+  '#BINUTILSPREFIX'#010+
   'endif'#010+
-  'ifeq ($(CPU_TARGET),sparc)'#010+
+  '#CPU_TARGET=powerpc64'#010+
+  'ife','q ($(CPU_TARGET),sparc)'#010+
   'ifneq ($(filter sparc64,$(shell uname -a)),)'#010+
   'ifeq ($(BINUTILSPREFIX),)'#010+
-  'GCCLIBDIR:=$(shell dirname',' `gcc -m32 -print-libgcc-file-name`)'#010+
-  'else'#010+
-  '# gcc mips seems not to recognize -m32/-m64'#010+
-  'ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)'#010+
-  'ifeq ($(BINUTILSPREFIX),)'#010+
-  'GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)'#010+
-  'else'#010+
-  'CROSSGC','COPT=-mabi=64'#010+
-  'endif'#010+
-  'else'#010+
-  '# gcc mips seems not to recognize -m32/-m64'#010+
-  'ifneq ($(filter $(CPU_TARGET),mips mipsel),)'#010+
-  'ifeq ($(BINUTILSPREFIX),)'#010+
-  'GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)'#010+
-  'else'#010+
-  'CROSSGCCOPT=-mabi=32'#010+
-  'endif'#010+
-  'e','lse'#010+
-  'ifeq ($(BINUTILSPREFIX),)'#010+
   'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+
   'else'#010+
   'CROSSGCCOPT=-m32'#010+
   'endif'#010+
+  '#BINUTILSPREFIX'#010+
   'endif'#010+
+  '#filter sparc64'#010+
   'endif'#010+
+  '#CPU_TARGE','T=sparc'#010+
+  '# gcc mips seems not to recognize -m32/-m64'#010+
+  'ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)'#010+
+  'ifeq ($(BINUTILSPREFIX),)'#010+
+  'GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)'#010+
+  'else'#010+
+  'CROSSGCCOPT=-mabi=64'#010+
   'endif'#010+
+  '#BINUTILSPREFI','X'#010+
   'endif'#010+
+  '#CPU_TARGET=mips64,mips64el'#010+
+  '# gcc mips seems not to recognize -m32/-m64'#010+
+  'ifneq ($(filter $(CPU_TARGET),mips mipsel),)'#010+
+  'ifeq ($(BINUTILSPREFIX),)'#010+
+  'GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)'#010+
+  'else'#010+
+  'CROSSGCCOPT=-mabi','=32'#010+
   'endif'#010+
+  '#BINUTILSPREFIX'#010+
   'endif'#010+
+  '#CPU_TARGET=mips,mipsel'#010+
+  'ifeq ($(BINUTILSPREFIX),)'#010+
+  'ifeq ($(GCCLIBDIR),)'#010+
+  'GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)'#010+
+  'endif'#010+
+  '#GCCLIBDIR='#010+
+  'else'#010+
+  'ifeq ($(CROSSGCCOPT),)'#010+
+  'CROSSGCCOPT=-g'#010+
+  'endif'#010+
+  '#CROSSGCCOPT','='#010+
+  'endif'#010+
+  '#BINUTILSPREFIX'#010+
+  'endif'#010+
+  '#GCCLIBDIR='#010+
   #010+
   '# Check if FPCFPMAKE compiler is same target as FPC'#010+
   'ifdef FPCFPMAKE'#010+
-  'FPCFPMAKE_CPU_','TARGET=$(shell $(FPCFPMAKE) -iTP)'#010+
+  'FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)'#010+
   'ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))'#010+
-  '# In that case use GCCLIBDIR value for FPCMAKEGCCLIBDIR'#010+
+  '# In that case use GCCLIBDIR value f','or FPCMAKEGCCLIBDIR'#010+
   'FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)'#010+
   'else'#010+
-  'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 spa',
-  'rc64 x86_64),)'#010+
+  'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 spar'+
+  'c64 x86_64),)'#010+
   'FPCMAKE_CROSSGCCOPT=-m64'#010+
   'else'#010+
-  'ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)'#010+
-  'FPCMAKE_CROSSGCCOPT=-mabi=64'#010+
+  'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)'#010+
+  'FPCMAKE_CRO','SSGCCOPT=-mabi=64'#010+
   'else'#010+
-  'ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)'#010+
+  'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips mipsel),)'#010+
   'FPCMAKE_CROSSGCCOPT=-mabi=32'#010+
   'else'#010+
-  'ifeq ($(FPCFPMAKE_C','PU_OPT),riscv64)'#010+
+  'ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)'#010+
   'FPCMAKE_CROSSGCCOPT=-mabi=lp64'#010+
   'else'#010+
-  'ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)'#010+
-  'FPCMAKE_CROSSGCCOPT=-mabi=ilp32'#010+
+  'ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)'#010+
+  'FPCMAKE_CROSSG','CCOPT=-mabi=ilp32'#010+
   'else'#010+
   'FPCMAKE_CROSSGCCOPT=-m32'#010+
   'endif'#010+
+  '#riscv32'#010+
   'endif'#010+
+  '#riscv64'#010+
   'endif'#010+
+  '#mips/mipsel'#010+
   'endif'#010+
+  '#mips64/mips64el'#010+
   'endif'#010+
-  'FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOP','T) -print'+
-  '-libgcc-file-name`)'#010+
+  '#64-bit targets'#010+
+  'FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-l'+
+  'ibgcc-file-name`)'#010+
   'endif'#010+
+  '#not',' CPU_TARGET=FPCFPMAKE_CPU_TARGET'#010+
   'endif'#010+
+  '#def FPCFPMAKE'#010+
   #010+
   'ifndef FPCMAKEGCCLIBDIR'#010+
   'FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)'#010+
@@ -999,20 +1026,22 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# Try cross gcc'#010+
   'ifndef GCCLIBDIR'#010+
-  'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXE',
-  'EXT),$(SEARCHPATH))))'#010+
+  'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFI','X)gcc$(SRCEX'+
+  'EEXT),$(SEARCHPATH))))'#010+
   'ifneq ($(CROSSGCC),)'#010+
   'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-f'+
   'ile-name`)'#010+
   'endif'#010+
+  '#CROSSGCC='#010+
   'endif'#010+
+  '#ndef GCCLIBDIR'#010+
   'endif'#010+
   '#ifeq($(OS_SOURCE),linux)'#010+
   #010+
   'ifdef inUnix'#010+
-  'ifeq ($(OS_SOURCE),netbsd)'#010+
+  'ifeq ($(OS_SOURCE)',',netbsd)'#010+
   'OTHERLIBDIR:=/usr/pkg/lib'#010+
-  'endif',#010+
+  'endif'#010+
   'export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR'#010+
   'endif'#010+
   #010+
@@ -1020,9 +1049,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '[extensions]'#010+
   '#####################################################################'#010+
   '# Default extensions'#010+
-  '#####################################################################'#010+
+  '#########################################','###########################'+
+  '#'#010+
   #010+
-  '# Default ','needed extensions (Go32v2,Linux)'#010+
+  '# Default needed extensions (Go32v2,Linux)'#010+
   'BATCHEXT=.bat'#010+
   'LOADEREXT=.as'#010+
   'EXEEXT=.exe'#010+
@@ -1035,9 +1065,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'STATICLIBEXT=.a'#010+
   'SHAREDLIBEXT=.so'#010+
   'SHAREDLIBPREFIX=libfp'#010+
-  'STATICLIBPREFIX=libp'#010+
+  'STATIC','LIBPREFIX=libp'#010+
   'IMPORTLIBPREFIX=libimp'#010+
-  'RS','TEXT=.rst'#010+
+  'RSTEXT=.rst'#010+
   '# external debug info for executable'#010+
   'EXEDBGEXT=.dbg'#010+
   '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+
@@ -1046,11 +1076,11 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '# Go32v1'#010+
   'ifeq ($(OS_TARGET),go32v1)'#010+
   'STATICLIBPREFIX='#010+
-  'SHORTSUFFIX=v1'#010+
+  'SHOR','TSUFFIX=v1'#010+
   'endif'#010+
   #010+
   '# Go32v2'#010+
-  'ifeq ($(OS_TA','RGET),go32v2)'#010+
+  'ifeq ($(OS_TARGET),go32v2)'#010+
   'STATICLIBPREFIX='#010+
   'SHORTSUFFIX=dos'#010+
   'IMPORTLIBPREFIX='#010+
@@ -1064,10 +1094,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'SHAREDLIBEXT=.dll'#010+
   'SHORTSUFFIX=wat'#010+
   'IMPORTLIBPREFIX='#010+
-  'endif'#010+
+  'end','if'#010+
   #010+
   '# Android native'#010+
-  'ifneq ($(CPU_TARGET','),jvm)'#010+
+  'ifneq ($(CPU_TARGET),jvm)'#010+
   'ifeq ($(OS_TARGET),android)'#010+
   'BATCHEXT=.sh'#010+
   'EXEEXT='#010+
@@ -1084,9 +1114,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'SHORTSUFFIX=lnx'#010+
   'endif'#010+
   #010+
-  '# DragonFly BSD'#010+
+  '# Drago','nFly BSD'#010+
   'ifeq ($(OS_TARGET),dragonfly)'#010+
-  'B','ATCHEXT=.sh'#010+
+  'BATCHEXT=.sh'#010+
   'EXEEXT='#010+
   'HASSHAREDLIB=1'#010+
   'SHORTSUFFIX=df'#010+
@@ -1102,10 +1132,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# NetBSD'#010+
   'ifeq ($(OS_TARGET),netbsd)'#010+
-  'BATCHEXT=.sh'#010+
+  'BATCHEXT=.','sh'#010+
   'EXEEXT='#010+
   'HASSHAREDLIB=1'#010+
-  'SHORTSUFFIX=nb','s'#010+
+  'SHORTSUFFIX=nbs'#010+
   'endif'#010+
   #010+
   '# OpenBSD'#010+
@@ -1123,10 +1153,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   '# OS/2'#010+
-  'ifeq ($(OS_TARGET),os2)'#010+
+  'ifeq ($(OS_T','ARGET),os2)'#010+
   'BATCHEXT=.cmd'#010+
   'AOUTEXT=.out'#010+
-  'S','TATICLIBPREFIX='#010+
+  'STATICLIBPREFIX='#010+
   'SHAREDLIBEXT=.dll'#010+
   'SHORTSUFFIX=os2'#010+
   'ECHO=echo'#010+
@@ -1140,12 +1170,12 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'STATICLIBPREFIX='#010+
   'SHAREDLIBEXT=.dll'#010+
   'SHORTSUFFIX=emx'#010+
-  'ECHO=echo'#010+
+  'ECHO=ech','o'#010+
   'IMPORTLIBPREFIX='#010+
   'endif'#010+
   #010+
   '# Amiga'#010+
-  'ifeq (','$(OS_TARGET),amiga)'#010+
+  'ifeq ($(OS_TARGET),amiga)'#010+
   'EXEEXT='#010+
   'SHAREDLIBEXT=.library'#010+
   'SHORTSUFFIX=amg'#010+
@@ -1160,9 +1190,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# MorphOS'#010+
   'ifeq ($(OS_TARGET),morphos)'#010+
-  'EXEEXT='#010+
+  'EXE','EXT='#010+
   'SHAREDLIBEXT=.library'#010+
-  'SHORTSUFFIX=m','os'#010+
+  'SHORTSUFFIX=mos'#010+
   'endif'#010+
   #010+
   '# Atari'#010+
@@ -1180,12 +1210,12 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# Haiku'#010+
   'ifeq ($(OS_TARGET),haiku)'#010+
-  'BATCHEXT=.sh'#010+
+  'BATCHEXT=.sh',#010+
   'EXEEXT='#010+
   'SHORTSUFFIX=hai'#010+
   'endif'#010+
   #010+
-  '# Solari','s'#010+
+  '# Solaris'#010+
   'ifeq ($(OS_TARGET),solaris)'#010+
   'BATCHEXT=.sh'#010+
   'EXEEXT='#010+
@@ -1201,10 +1231,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# Netware clib'#010+
   'ifeq ($(OS_TARGET),netware)'#010+
-  'EXEEXT=.nlm'#010+
+  'EXEEXT=.n','lm'#010+
   'STATICLIBPREFIX='#010+
   'SHORTSUFFIX=nw'#010+
-  'IMPOR','TLIBPREFIX=imp'#010+
+  'IMPORTLIBPREFIX=imp'#010+
   'endif'#010+
   #010+
   '# Netware libc'#010+
@@ -1218,9 +1248,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '# Mac OS Classic'#010+
   'ifeq ($(OS_TARGET),macosclassic)'#010+
   'BATCHEXT='#010+
-  'EXEEXT='#010+
+  'EX','EEXT='#010+
   'DEBUGSYMEXT=.xcoff'#010+
-  'SHORTSUFFIX=mac',#010+
+  'SHORTSUFFIX=mac'#010+
   'IMPORTLIBPREFIX=imp'#010+
   'endif'#010+
   #010+
@@ -1235,9 +1265,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# gba'#010+
   'ifeq ($(OS_TARGET),gba)'#010+
-  'EXEEXT=.gba'#010+
+  'EXEEX','T=.gba'#010+
   'SHAREDLIBEXT=.so'#010+
-  'SHORTSUFFIX=gba'#010,
+  'SHORTSUFFIX=gba'#010+
   'endif'#010+
   #010+
   '# Symbian OS'#010+
@@ -1253,10 +1283,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   '# wii'#010+
-  'ifeq ($(OS_TARGET),wii)'#010+
+  'ifeq ($(OS_TARG','ET),wii)'#010+
   'EXEEXT=.dol'#010+
   'SHAREDLIBEXT=.so'#010+
-  'SH','ORTSUFFIX=wii'#010+
+  'SHORTSUFFIX=wii'#010+
   'endif'#010+
   #010+
   '# AIX'#010+
@@ -1272,11 +1302,11 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'OEXT=.class'#010+
   'ASMEXT=.j'#010+
   'SHAREDLIBEXT=.jar'#010+
-  'SHORTSUFFIX=java'#010+
+  'SHORTSUFFIX=java'#010,
   'endif'#010+
   #010+
   '# Android java'#010+
-  'ifeq ($(CPU_TARGET','),jvm)'#010+
+  'ifeq ($(CPU_TARGET),jvm)'#010+
   'ifeq ($(OS_TARGET),android)'#010+
   'OEXT=.class'#010+
   'ASMEXT=.j'#010+
@@ -1292,9 +1322,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'SHORTSUFFIX=d16'#010+
   'endif'#010+
   #010+
-  '# MSX-DOS'#010+
+  '#',' MSX-DOS'#010+
   'ifeq ($(OS_TARGET),msxdos)'#010+
-  'STAT','ICLIBPREFIX='#010+
+  'STATICLIBPREFIX='#010+
   'STATICLIBEXT=.a'#010+
   'SHORTSUFFIX=msd'#010+
   'endif'#010+
@@ -1307,13 +1337,13 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'else'#010+
   'EXEEXT=.bin'#010+
   'endif'#010+
-  'ifeq ($(CPU_TARGET),z80)'#010+
+  'ifeq ($(CPU_TARGET),z80)'#010,
   'OEXT=.rel'#010+
   'endif'#010+
   'SHORTSUFFIX=emb'#010+
   'endif'#010+
   #010+
-  '#',' Win16'#010+
+  '# Win16'#010+
   'ifeq ($(OS_TARGET),win16)'#010+
   'STATICLIBPREFIX='#010+
   'STATICLIBEXT=.a'#010+
@@ -1327,21 +1357,21 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   '# WASI'#010+
-  'ifeq ($(OS_TARGET),wasi)'#010+
+  'ifeq ($(OS_TARGET),wasi)',#010+
   'EXEEXT=.wasm'#010+
   'endif'#010+
   #010+
   #010+
-  '# For 8.3 limited ','OS'#039's the short suffixes'#010+
+  '# For 8.3 limited OS'#039's the short suffixes'#010+
   '# Otherwise use the full source/target names'#010+
   'ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)'#010+
   'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+
   'ZIPSUFFIX=$(SHORTSUFFIX)'#010+
   'ZIPCROSSPREFIX='#010+
-  'ZIPSOURCESUFFIX=src'#010+
+  'ZIPSOURCESUFFI','X=src'#010+
   'ZIPEXAMPLESUFFIX=exm'#010+
   'else'#010+
-  'FPCMADE=','fpcmade.$(TARGETSUFFIX)'#010+
+  'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+
   'ZIPSOURCESUFFIX=.source'#010+
   'ZIPEXAMPLESUFFIX=.examples'#010+
   'ifdef CROSSCOMPILE'#010+
@@ -1349,20 +1379,19 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+
   'else'#010+
   'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+
-  'ZIPCROSSPREFIX='#010+
+  'ZIPCROSSPREFIX=',#010+
   'endif'#010+
   'endif'#010+
   #010+
   '[defaulttools]'#010+
-  '###########','#########################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Default Tools'#010+
   '#####################################################################'#010+
   #010+
   '# Names of the binutils tools'#010+
-  'ASNAME=$(BINUTILSPREFIX)as'#010+
+  'ASNAME=$(BINUTILSPREFIX)','as'#010+
   'LDNAME=$(BINUTILSPREFIX)ld'#010+
-  'ARNAME=$(B','INUTILSPREFIX)ar'#010+
+  'ARNAME=$(BINUTILSPREFIX)ar'#010+
   'RCNAME=$(BINUTILSPREFIX)rc'#010+
   'NASMNAME=$(BINUTILSPREFIX)nasm'#010+
   #010+
@@ -1370,12 +1399,12 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifndef ASPROG'#010+
   'ifdef CROSSBINDIR'#010+
   'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+
-  'else'#010+
+  'else',#010+
   'ASPROG=$(ASNAME)'#010+
   'endif'#010+
   'endif'#010+
   #010+
-  '# linker,',' but probably not used'#010+
+  '# linker, but probably not used'#010+
   'ifndef LDPROG'#010+
   'ifdef CROSSBINDIR'#010+
   'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+
@@ -1387,9 +1416,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '# Resource compiler'#010+
   'ifndef RCPROG'#010+
   'ifdef CROSSBINDIR'#010+
-  'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+
+  'RCPROG=$(CROSS','BINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+
   'else'#010+
-  'RCPRO','G=$(RCNAME)'#010+
+  'RCPROG=$(RCNAME)'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1403,9 +1432,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   '# NASM assembler, redefine it if cross compiling'#010+
-  'ifndef NASMPROG'#010+
+  'ifnd','ef NASMPROG'#010+
   'ifdef CROSSBINDIR'#010+
-  'NASMPROG=$','(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+
+  'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+
   'else'#010+
   'NASMPROG=$(NASMNAME)'#010+
   'endif'#010+
@@ -1419,10 +1448,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'NASM=$(NASMPROG)'#010+
   #010+
   '# ppas.bat / ppas.sh'#010+
-  'ifdef inUnix'#010+
+  'ifdef inUnix',#010+
   'PPAS=./ppas$(SRCBATCHEXT)'#010+
   'else'#010+
-  'PPAS=ppa','s$(SRCBATCHEXT)'#010+
+  'PPAS=ppas$(SRCBATCHEXT)'#010+
   'endif'#010+
   #010+
   '# ldconfig to rebuild .so cache'#010+
@@ -1440,10 +1469,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# Zip options'#010+
   'ZIPOPT=-9'#010+
-  'ZIPEXT=.zip'#010+
+  'ZI','PEXT=.zip'#010+
   #010+
   '# Tar options'#010+
-  'ifeq ($(USETAR)',',bz2)'#010+
+  'ifeq ($(USETAR),bz2)'#010+
   'TAROPT=vj'#010+
   'TAREXT=.tar.bz2'#010+
   'else'#010+
@@ -1455,7 +1484,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '[command_begin]'#010+
   '#####################################################################'#010+
   '# Compiler Command Line'#010+
-  '############################################################','########'+
+  '####################','################################################'+
   '#'#010+
   #010+
   '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+
@@ -1465,8 +1494,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   #010+
-  '# Load commandline OPT and add target and unit dir to be sure'#010+
-  'ifneq ($(','OS_TARGET),$(OS_SOURCE))'#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+
@@ -1475,8 +1504,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   'ifeq ($(OS_SOURCE),openbsd)'#010+
-  'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+
-  'override FPCMAKEOPT+=-FD$(NEW_BINUTIL','S_PATH)'#010+
+  'override FPCOPT+=-FD$(NEW_BINUTILS_PAT','H)'#010+
+  'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+
   'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+
   'endif'#010+
   #010+
@@ -1484,19 +1513,19 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifneq ($(BINUTILSPREFIX),)'#010+
   'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+
   'ifneq ($(RLINKPATH),)'#010+
-  'override FPCOPT+=-Xr$(RLINKPATH)'#010+
+  'override FPCOPT+=-Xr$(RLI','NKPATH)'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   #010+
-  '# When BINUTI','LSPREFIX is given and we are not cross-compiling then u'+
-  'se'#010+
+  '# When BINUTILSPREFIX is given and we are not cross-compiling then use'+
+  #010+
   '# it while compiling the fpmake file. (For example to build i386-freeb'+
   'sd'#010+
   '# with BINUTILSPREFIX=i386-)'#010+
   'ifndef CROSSCOMPILE'#010+
-  'ifneq ($(BINUTILSPREFIX),)'#010+
-  'override FPCMAKEOPT+=-XP$(BINUTIL','SPREFIX)'#010+
+  'ifneq ($(BINUTILSPRE','FIX),)'#010+
+  'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+
   'override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+
   'endif'#010+
   'endif'#010+
@@ -1505,8 +1534,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifdef UNITDIR'#010+
   'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
   'endif'#010+
-  'ifdef LIBDIR'#010+
-  'override FPCOPT+=$(addprefix -Fl,$(','LIBDIR))'#010+
+  'ifdef LI','BDIR'#010+
+  'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
   'endif'#010+
   'ifdef OBJDIR'#010+
   'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
@@ -1518,10 +1547,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '# Smartlinking'#010+
   'ifdef LINKSMART'#010+
   'override FPCOPT+=-XX'#010+
-  'endif'#010+
+  'endif'#010,
   #010+
   '# Smartlinking creation'#010+
-  'ifdef CREATESMA','RT'#010+
+  'ifdef CREATESMART'#010+
   'override FPCOPT+=-CX'#010+
   'endif'#010+
   #010+
@@ -1535,8 +1564,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '# (strip, optimize and don'#039't load fpc.cfg)'#010+
   'ifdef RELEASE'#010+
   'FPCCPUOPT:=-O2'#010+
-  'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+
-  'overrid','e FPCOPTDEF+=RELEASE'#010+
+  'override',' FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+
+  'override FPCOPTDEF+=RELEASE'#010+
   'endif'#010+
   #010+
   '# Strip'#010+
@@ -1551,10 +1580,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# Verbose settings (warning,note,info)'#010+
   'ifdef VERBOSE'#010+
-  'override FPCOPT+=-vwni'#010+
+  'override FPCOPT+','=-vwni'#010+
   'endif'#010+
   #010+
-  '# Needed compiler options'#010,
+  '# Needed compiler options'#010+
   'ifdef COMPILER_OPTIONS'#010+
   'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
   'endif'#010+
@@ -1562,9 +1591,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
   'endif'#010+
   'ifdef COMPILER_LIBRARYDIR'#010+
-  'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
+  'override FPCOPT+=$(addpre','fix -Fl,$(COMPILER_LIBRARYDIR))'#010+
   'endif'#010+
-  'if','def COMPILER_OBJECTDIR'#010+
+  'ifdef COMPILER_OBJECTDIR'#010+
   'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
   'endif'#010+
   'ifdef COMPILER_INCLUDEDIR'#010+
@@ -1572,8 +1601,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   '# Cross compiler utils'#010+
-  'ifdef CROSSBINDIR'#010+
-  'override FPCOPT+=-FD$(CR','OSSBINDIR)'#010+
+  'if','def CROSSBINDIR'#010+
+  'override FPCOPT+=-FD$(CROSSBINDIR)'#010+
   'endif'#010+
   #010+
   '# Target dirs and the prefix to use for clean/install'#010+
@@ -1581,8 +1610,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
   'ifeq ($(COMPILER_TARGETDIR),.)'#010+
   'override TARGETDIRPREFIX='#010+
-  'else'#010+
-  'override TARGETDIRPREFIX=$(COMPILER_TAR','GETDIR)/'#010+
+  'else',#010+
+  'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1590,9 +1619,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifdef COMPILER_UNITTARGETDIR'#010+
   'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
   'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
-  'override UNITTARGETDIRPREFIX='#010+
+  'override UNITTARGETD','IRPREFIX='#010+
   'else'#010+
-  'override UNITTARGETDIRPRE','FIX=$(COMPILER_UNITTARGETDIR)/'#010+
+  'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+
   'endif'#010+
   'else'#010+
   'ifdef COMPILER_TARGETDIR'#010+
@@ -1601,15 +1630,15 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  'ifdef SYSROOTPATH'#010+
+  'ifdef SYSROOTPATH'#010,
   'override FPCOPT+=-XR$(SYSROOTPATH)'#010+
-  'else'#010,
+  'else'#010+
   '# if we are compiling natively on aarch64-darwin and if -/Library/Deve'+
   'loper/CommandLineTools/SDKs/MacOSX.sdk exists,'#010+
   '# add it to the compiler command line'#010+
   'ifeq ($(OS_TARGET),$(OS_SOURCE))'#010+
-  'ifeq ($(OS_TARGET),darwin)'#010+
-  '# so far the only tested ','one'#010+
+  'ifeq ($(OS_T','ARGET),darwin)'#010+
+  '# so far the only tested one'#010+
   'ifeq ($(CPU_TARGET),aarch64)'#010+
   'ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk)'+
   ',)'#010+
@@ -1618,18 +1647,18 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'endif'#010+
-  'endif'#010+
+  'endi','f'#010+
   'endif'#010+
   #010+
   'ifdef CREATESHARED'#010+
-  'override FPC','OPT+=-Cg'#010+
+  'override FPCOPT+=-Cg'#010+
   'endif'#010+
   #010+
   '# create always pic'#039'ed code on x86_64, mips and mipsel'#010+
   '# on unix-like systems'#010+
   'ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux so'+
   'laris),)'#010+
-  'ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el ri','s'+
+  'ifneq ($(filter $(CPU_TARGE','T),x86_64 mips mipsel mips64 mips64el ris'+
   'cv64 powerpc64),)'#010+
   'override FPCOPT+=-Cg'#010+
   'endif'#010+
@@ -1643,8 +1672,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '[command_libc]'#010+
   '# Add GCC lib path if asked'#010+
   'ifdef GCCLIBDIR'#010+
-  'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
-  'ifdef FPCMAKEGCCLIBDIR',#010+
+  'override FPCOPT','+=-Fl$(GCCLIBDIR)'#010+
+  'ifdef FPCMAKEGCCLIBDIR'#010+
   'override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)'#010+
   'else'#010+
   'override FPCMAKEOPT+=-Fl$(GCCLIBDIR)'#010+
@@ -1656,7 +1685,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   #010+
   '[command_end]'#010+
-  '# Add commandline options last so they can override'#010,
+  '# Add comman','dline options last so they can override'#010+
   'ifdef OPT'#010+
   'override FPCOPT+=$(OPT)'#010+
   'endif'#010+
@@ -1664,10 +1693,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '# Override options to compile the fpmake-binary with command-line opti'+
   'ons provided in FPMAKEBUILDOPT'#010+
   'ifdef FPMAKEBUILDOPT'#010+
-  'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+
+  'override FPMAKE_BUILD_OPT+=$(FPMAKEBU','ILDOPT)'#010+
   'endif'#010+
   #010+
-  '# Add defines from FPCOPT','DEF to FPCOPT'#010+
+  '# Add defines from FPCOPTDEF to FPCOPT'#010+
   'ifdef FPCOPTDEF'#010+
   'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
   'endif'#010+
@@ -1677,9 +1706,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'override FPCOPT+=@$(CFGFILE)'#010+
   'endif'#010+
   #010+
-  '# Use the environment to pass commandline options?'#010+
+  '# Use the environment to pass comma','ndline options?'#010+
   'ifdef USEENV'#010+
-  'override FP','CEXTCMD:=$(FPCOPT)'#010+
+  'override FPCEXTCMD:=$(FPCOPT)'#010+
   'override FPCOPT:=!FPCEXTCMD'#010+
   'export FPCEXTCMD'#010+
   'endif'#010+
@@ -1687,9 +1716,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
   'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
   #010+
-  'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+
+  'ifneq ($(AFULL_TARGET),$(AFULL','_SOURCE))'#010+
   'override ACROSSCOMPILE=1'#010+
-  'endif',#010+
+  'endif'#010+
   #010+
   'ifdef ACROSSCOMPILE'#010+
   'override FPCOPT+=$(CROSSOPT)'#010+
@@ -1699,8 +1728,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+
   #010+
   '# also call ppas if with command option -s'#010+
-  '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+
-  '# or if -sh is',' used'#010+
+  '# but only if the FULL_SOURCE ','and FULL_TARGET are equal'#010+
+  '# or if -sh is used'#010+
   'ifneq (,$(filter -sh,$(COMPILER)))'#010+
   'UseEXECPPAS=1'#010+
   'endif'#010+
@@ -1712,8 +1741,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifneq ($(UseEXECPPAS),1)'#010+
   'EXECPPAS='#010+
   'else'#010+
-  'ifdef RUNBATCH'#010+
-  'EXECPPAS:=@$(RUNBATCH) $(PP','AS)'#010+
+  'if','def RUNBATCH'#010+
+  'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+
   'else'#010+
   'EXECPPAS:=@$(PPAS)'#010+
   'endif'#010+
@@ -1723,20 +1752,21 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '[loaderrules]'#010+
   '#####################################################################'#010+
   '# Loaders'#010+
-  '#####################################################################'#010+
+  '################################################################','####'+
+  '#'#010+
   #010+
   '.PHONY: fpc_loaders'#010+
   #010+
-  'ifneq ($(TAR','GET_LOADERS),)'#010+
+  'ifneq ($(TARGET_LOADERS),)'#010+
   'override ALLTARGET+=fpc_loaders'#010+
   'override CLEANTARGET+=fpc_loaders_clean'#010+
   'override INSTALLTARGET+=fpc_loaders_install'#010+
   #010+
   'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
-  'endif'#010+
+  'endif'#010,
   #010+
   '%$(OEXT): %$(LOADEREXT)'#010+
-  'ifdef COMPILER_','UNITTARGETDIR'#010+
+  'ifdef COMPILER_UNITTARGETDIR'#010+
   '        $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
   'else'#010+
   '        $(AS) -o $*$(OEXT) $<'#010+
@@ -1745,9 +1775,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+
   #010+
   'fpc_loaders_clean:'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
-  '        -$(DEL) $(addpre','fix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILE'+
-  'S))'#010+
+  'ifdef COMPILE','R_UNITTARGETDIR'#010+
+  '        -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+
+  ')'#010+
   'else'#010+
   '        -$(DEL) $(LOADEROFILES)'#010+
   'endif'#010+
@@ -1755,7 +1785,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'fpc_loaders_install:'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
   'ifdef COMPILER_UNITTARGETDIR'#010+
-  '        $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LO','ADEROF'+
+  '        $(INSTALL) $(a','ddprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+
   'ILES)) $(INSTALL_UNITDIR)'#010+
   'else'#010+
   '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
@@ -1765,7 +1795,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '[unitrules]'#010+
   '#####################################################################'#010+
   '# Units'#010+
-  '###################################################','#################'+
+  '###########','#########################################################'+
   '#'#010+
   #010+
   '.PHONY: fpc_units'#010+
@@ -1774,42 +1804,41 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'override ALLTARGET+=fpc_units'#010+
   #010+
   'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
-  'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_','IMPLICI'+
+  'override IMPLICITUNIT','PPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+
   'TUNITS))'#010+
   'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
   'endif'#010+
   #010+
-  'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+
+  'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUF','ILES)'#010+
   #010+
   #010+
   '[exerules]'#010+
-  '#####################','###############################################'+
-  '#'#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+
+  'ifnd','ef CROSSINSTALL'#010+
+  'ifneq ($(TARGET_PROGRAMS),)'#010+
   'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
   'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffi'+
-  'x $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuf'+
-  'fix $(STATICLIBEXT),$(TARGET_PROGRAM','S))) $(addprefix $(IMPORTLIBPREF'+
+  'x $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(ad','ds'+
+  'uffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREF'+
   'IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+
   'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+
   #010+
   'override ALLTARGET+=fpc_exes'#010+
-  'override INSTALLEXEFILES+=$(EXEFILES)'#010+
-  'override CLEANEXEFIL','ES+=$(EXEFILES) $(EXEOFILES)'#010+
+  'override INSTALLEX','EFILES+=$(EXEFILES)'#010+
+  'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
   'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#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+
+  'override',' CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
@@ -1819,9 +1848,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '[rstrules]'#010+
   '#####################################################################'#010+
-  '# Resource strings'#010+
-  '##############################','######################################'+
-  '#'#010+
+  '# Resourc','e strings'#010+
+  '#####################################################################'#010+
   #010+
   'ifdef TARGET_RSTS'#010+
   'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
@@ -1831,7 +1859,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   #010+
   '[examplerules]'#010+
-  '#################################################################','###'+
+  '#########################','###########################################'+
   '#'#010+
   '# Examples'#010+
   '#####################################################################'#010+
@@ -1840,23 +1868,23 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   'ifneq ($(TARGET_EXAMPLES),)'#010+
   'HASEXAMPLES=1'#010+
-  'override EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPL'+
-  'ES)) $(addsuffix .p','as,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_'+
+  'override EXAMPLESOURCEFILES=$(wildcard $(addsuffi','x .pp,$(TARGET_EXAM'+
+  'PLES)) $(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)) $(adds'+
-  'uffix $','(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$'+
+  'override EXAMPLEOFILES:=$(addsuffix $','(OEXT),$(TARGET_EXAMPLES)) $(ad'+
+  'dsuffix $(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$'+
   '(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLI'+
   'BPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+
-  'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),','$(TARGET_EXAMPLES'+
+  'override EX','AMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES'+
   '))'#010+
   #010+
   'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
   'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+
   'ifeq ($(OS_TARGET),os2)'#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TAR','GET_EXAMPLES))'#010+
   'endif'#010+
-  'ifeq ($(OS_TARGET),','emx)'#010+
+  'ifeq ($(OS_TARGET),emx)'#010+
   'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
   'endif'#010+
   'endif'#010+
@@ -1864,19 +1892,18 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'HASEXAMPLES=1'#010+
   'endif'#010+
   #010+
-  'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+
-  'S))'#010+
+  'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAM','PLED'+
+  'IRS))'#010+
   #010+
   #010+
   '[compilerules]'#010+
-  '#############','#######################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# General compile rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+
+  '.PHONY: fpc_all fpc_smart fpc_debug fpc_release ','fpc_shared'#010+
   #010+
-  '$(FPCMADE): $(ALLDEPENDENCIE','S) $(ALLTARGET)'#010+
+  '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
   '        @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
   #010+
   'fpc_all: $(FPCMADE)'#010+
@@ -1888,19 +1915,19 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '        $(MAKE) all DEBUG=1'#010+
   #010+
   'fpc_release:'#010+
-  '        $(MAKE) all RELEASE=1'#010+
+  '       ',' $(MAKE) all RELEASE=1'#010+
   #010+
-  '# General compil','e rules, available for both possible .pp and .pas ex'+
-  'tensions'#010+
+  '# General compile rules, available for both possible .pp and .pas exte'+
+  'nsions'#010+
   #010+
   '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+
   'c .res'#010+
   #010+
   '$(COMPILER_UNITTARGETDIR):'#010+
-  '        $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
+  '        $(MKDIRTREE) $(COMPILER_U','NITTARGETDIR)'#010+
   #010+
   '$(COMPILER_TARGETDIR):'#010+
-  '  ','      $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
+  '        $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
   #010+
   '%$(PPUEXT): %.pp'#010+
   '        $(COMPILER) $<'#010+
@@ -1911,10 +1938,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '        $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.pp'#010+
-  '        $(COMPILER) $<'#010+
+  '        $(COMPILER',') $<'#010+
   '        $(EXECPPAS)'#010+
   #010+
-  '%$(EXEEXT): %.','pas'#010+
+  '%$(EXEEXT): %.pas'#010+
   '        $(COMPILER) $<'#010+
   '        $(EXECPPAS)'#010+
   #010+
@@ -1927,20 +1954,20 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '        $(EXECPPAS)'#010+
   #010+
   '%.res: %.rc'#010+
-  '        windres -i $< -o $@'#010+
+  '        windres ','-i $< -o $@'#010+
   #010+
-  '# Search paths for .ppu, .p','p, .pas, .lpr, .dpr'#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_INCLU','DEDIR)'#010+
+  'vpath %.dp','r $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+
   'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
   'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+
   'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
   #010+
   '[sharedrules]'#010+
-  '########################################################','############'+
+  '################','####################################################'+
   '#'#010+
   '# Library'#010+
   '#####################################################################'#010+
@@ -1950,10 +1977,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'override INSTALLTARGET+=fpc_shared_install'#010+
   #010+
   'ifndef SHARED_LIBVERSION'#010+
-  'SHARED_LIBVERSION=$(FPC_VERSION)'#010+
+  'SHARED_LIBVERSIO','N=$(FPC_VERSION)'#010+
   'endif'#010+
   #010+
-  'ifndef SHARED_LI','BNAME'#010+
+  'ifndef SHARED_LIBNAME'#010+
   'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+
   'endif'#010+
   #010+
@@ -1962,44 +1989,43 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'N)$(SHAREDLIBEXT)'#010+
   'endif'#010+
   #010+
-  '# Default sharedlib units are all unit objects'#010+
+  '# Default sharedlib units are all unit',' objects'#010+
   'ifndef SHARED_LIBUNITS'#010+
-  'SHARED_L','IBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#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 LINKSHARED=1 CREATESMART=1'#010+
-  'ifneq ($(SH','ARED_BUILD),n)'#010+
+  '        $(MAKE) all CREATESHARED=','1 LINKSHARED=1 CREATESMART=1'#010+
+  'ifneq ($(SHARED_BUILD),n)'#010+
   '        $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+
   'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+
   'endif'#010+
   'else'#010+
-  '        @$(ECHO) Shared Libraries not supported'#010+
+  '        @$(ECHO) Shared Libraries no','t supported'#010+
   'endif'#010+
   #010+
   'fpc_shared_install:'#010+
-  'i','fneq ($(SHARED_BUILD),n)'#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+
+  'ALL_SHAREDD','IR)'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
   #010+
   '[installrules]'#010+
-  '##','##################################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Install rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
+  '.PHONY: fpc_install fpc_sourceinstall fpc_exa','mpleinstall'#010+
   #010+
   'ifdef INSTALL_UNITS'#010+
-  'overrid','e INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
+  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
   'endif'#010+
   #010+
   'ifdef INSTALL_BUILDUNIT'#010+
@@ -2007,30 +2033,29 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '(INSTALLPPUFILES))'#010+
   'endif'#010+
   #010+
-  'ifdef INSTALLPPUFILES'#010+
-  '# Avoid getting the same name tw','ice as some install EXE fail'#010+
+  'ifdef INSTALLP','PUFILES'#010+
+  '# Avoid getting the same name twice as some install EXE fail'#010+
   '# in this case, happends for instance for OS/2 target'#010+
   'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+
   'IBEXT))'#010+
-  'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
-  'LES)) $(s','ubst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
-  'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
-  ') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+
-  'NSTALLPPUFILES)))'#010+
-  'else'#010+
-  'override INSTALLPP','ULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
+  'override INSTALLPPULINKFILES:=$(subst $','(PPUEXT),$(OEXT),$(INSTALLPPU'+
   'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
   'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
-  ')'#010+
+  ') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+
+  'N','STALLPPUFILES)))'#010+
+  'else'#010+
+  'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
+  'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+
+  'ATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+
   'endif'#010+
   #010+
-  'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
-  'override ','INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
+  'i','fneq ($(UNITTARGETDIRPREFIX),)'#010+
+  'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
   'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+
   'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+
-  'PUFILENAMES))'#010+
-  'override INSTALLPPULINKFILES=$(wildcard',' $(addprefix $(UNITTARGETDIRP'+
-  'REFIX),$(INSTALLPPULINKFILENAMES)))'#010+
+  'PUFILENAMES))',#010+
+  'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+
+  'FIX),$(INSTALLPPULINKFILENAMES)))'#010+
   'endif'#010+
   '# Implicitly install Package.fpc'#010+
   'override INSTALL_CREATEPACKAGEFPC=1'#010+
@@ -2038,7 +2063,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   'ifdef INSTALLEXEFILES'#010+
   'ifneq ($(TARGETDIRPREFIX),)'#010+
-  'override INSTALLEXEFILES:=$(addprefix $(TAR','GETDIRPREFIX),$(notdir $('+
+  'ove','rride INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $('+
   'INSTALLEXEFILES)))'#010+
   'endif'#010+
   'endif'#010+
@@ -2046,16 +2071,16 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'fpc_install: all $(INSTALLTARGET)'#010+
   'ifdef INSTALLEXEFILES'#010+
   '        $(MKDIR) $(INSTALL_BINDIR)'#010+
-  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
+  '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_B','INDIR)'#010+
   'endif'#010+
-  'ifdef INSTALL_CREATEPACKAGE','FPC'#010+
+  'ifdef INSTALL_CREATEPACKAGEFPC'#010+
   'ifdef FPCMAKE'#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$(CPU_TARGET)-$','(OS_TARGET) Makefile.fpc'#010+
+  'ifneq ($(wildcard Makefile.fpc),)',#010+
+  '        $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
   '        $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
   'endif'#010+
@@ -2064,14 +2089,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   'ifdef INSTALLPPUFILES'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
-  '        $(INSTALL) $(INSTALLPPUFILES) $(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_LIBDIR)'#010+
-  'ifdef ','inUnix'#010+
+  '        $(INSTALL) ','$(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
+  'ifdef inUnix'#010+
   '        ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
   'endif'#010+
   'endif'#010+
@@ -2079,45 +2104,43 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifdef INSTALL_FILES'#010+
   '        $(MKDIR) $(INSTALL_DATADIR)'#010+
   '        $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
-  'endif'#010+
+  'end','if'#010+
   #010+
   'fpc_sourceinstall: distclean'#010+
-  '       ',' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
+  '        $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
   '        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
   #010+
   'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+
   'ARGET_EXAMPLEDIRS))'#010+
   'ifdef HASEXAMPLES'#010+
-  '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
+  '      ','  $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
-  'i','fdef EXAMPLESOURCEFILES'#010+
+  'ifdef EXAMPLESOURCEFILES'#010+
   '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
   '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
   'AMPLEDIR)'#010+
-  'endif'#010+
+  'endif',#010+
   #010+
   '[distinstallrules]'#010+
-  '###################','#################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Dist Install'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_distinstall'#010+
   #010+
-  'fpc_distinstall: install exampleinstall'#010+
+  'fpc_distinstall: install exampleinstal','l'#010+
   #010+
   #010+
   '[zipinstallrules]'#010+
-  '##################','##################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# Zip'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
   #010+
-  '# Temporary path to pack a file, can only us','e a single deep'#010+
+  '# Te','mporary path to pack a file, can only use a single deep'#010+
   '# subdir, because the deltree can'#039't see the whole tree to remove'#010+
   'ifndef PACKDIR'#010+
   'ifndef inUnix'#010+
@@ -2127,8 +2150,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Maybe create default zipname from packagename'#010+
-  'ifndef ZIPN','AME'#010+
+  '# Maybe create defa','ult zipname from packagename'#010+
+  'ifndef ZIPNAME'#010+
   'ifdef DIST_ZIPNAME'#010+
   'ZIPNAME=$(DIST_ZIPNAME)'#010+
   'else'#010+
@@ -2141,9 +2164,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   '# ZipTarget'#010+
-  'ifndef ZIPTARGET'#010+
+  'ifndef ZI','PTARGET'#010+
   'ifdef DIST_ZIPTARGET'#010+
-  'ZIPTARGET=D','IST_ZIPTARGET'#010+
+  'ZIPTARGET=DIST_ZIPTARGET'#010+
   'else'#010+
   'ZIPTARGET=install'#010+
   'endif'#010+
@@ -2158,10 +2181,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# Use a wrapper script by default for Os/2'#010+
   'ifndef inUnix'#010+
-  'USEZIPWRAPPER=1'#010+
+  'USEZIPWRAPP','ER=1'#010+
   'endif'#010+
   #010+
-  '# We need to be able to run ','in the current OS so fix'#010+
+  '# We need to be able to run in the current OS so fix'#010+
   '# the path separator'#010+
   'ifdef USEZIPWRAPPER'#010+
   'ZIPPATHSEP=$(PATHSEP)'#010+
@@ -2170,35 +2193,35 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ZIPPATHSEP=/'#010+
   'endif'#010+
   #010+
-  '# Create commands to create the zip/tar file'#010+
-  'ZIPCMD_CDPAC','K:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#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+
+  'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(Z','IPDESTFILE) *'#010+
   'else'#010+
-  'ZIPDESTFILE:=$(DIST_D','ESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#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+
+  '        $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=','1'#010+
   '        $(MKDIR) $(DIST_DESTDIR)'#010+
-  '     ','   $(DEL) $(ZIPDESTFILE)'#010+
+  '        $(DEL) $(ZIPDESTFILE)'#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 \,\\,$(Z','IPCMD_ZIP))" >> $(ZIPWRAPPE'+
+  ' ','       $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+
   'R)'#010+
   '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
   'ER)'#010+
   'else'#010+
   '        echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
   '        echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
-  '        echo $(ZIPCMD_CDBASE) >> $(ZIPWRA','PPER)'#010+
+  ' ','       echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
   'endif'#010+
   'ifdef inUnix'#010+
   '        /bin/sh $(ZIPWRAPPER)'#010+
@@ -2211,7 +2234,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   '        $(DEL) $(ZIPWRAPPER)'#010+
   'else'#010+
-  '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE',')'#010+
+  '        $(ZIPCMD_C','DPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
   'endif'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   #010+
@@ -2221,7 +2244,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   'fpc_zipexampleinstall:'#010+
   'ifdef HASEXAMPLES'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinsta','ll ZIPSUFFIX=$('+
+  '        $(MAK','E) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$('+
   'ZIPEXAMPLESUFFIX)'#010+
   'endif'#010+
   #010+
@@ -2231,24 +2254,23 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '[cleanrules]'#010+
   '#####################################################################'#010+
-  '# Clean rules'#010+
-  '############################','########################################'+
-  '#'#010+
+  '# ','Clean rules'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
   #010+
   'ifdef EXEFILES'#010+
   'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
   '))'#010+
-  'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLE','ANEXE'+
+  'override CLEANEXEDBGFIL','ES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXE'+
   'DBGFILES))'#010+
   'endif'#010+
   #010+
   'ifdef CLEAN_PROGRAMS'#010+
   'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
   'XEEXT), $(CLEAN_PROGRAMS)))'#010+
-  'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+
-  '$(EXEDBGEXT), $(CLEAN_PROGRA','MS)))'#010+
+  'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),','$(addsuffi'+
+  'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+
   'endif'#010+
   #010+
   'ifdef CLEAN_UNITS'#010+
@@ -2257,28 +2279,28 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   'ifdef CLEANPPUFILES'#010+
   'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
-  ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(','addprefix $(STATIC'+
+  ') $(subst ','$(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATIC'+
   'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+
   'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+
   'ILES)))'#010+
   'ifdef DEBUGSYMEXT'#010+
-  'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYM','EXT),$(CLEAN'+
+  'override CLEANPP','ULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+
   'PPUFILES))'#010+
   'endif'#010+
   'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+
   'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+
   'LENAMES))'#010+
-  'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+
-  'override CLEANPPULINKFILES=$(wild','card $(addprefix $(UNITTARGETDIRPRE'+
-  'FIX),$(CLEANPPULINKFILENAMES)))'#010+
+  'override CLEANPPULINKFILENAMES:=$(CLEANPPULINK','FILES)'#010+
+  'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+
+  'X),$(CLEANPPULINKFILENAMES)))'#010+
   'endif'#010+
   #010+
   'fpc_clean: $(CLEANTARGET)'#010+
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
-  '# DELTREE instead of DEL because on Mac OS X these are directories'#010+
-  'ifdef CLEANEXE','DBGFILES'#010+
+  '# DELTREE instead of DEL because on Mac O','S X these are directories'#010+
+  'ifdef CLEANEXEDBGFILES'#010+
   '        -$(DELTREE) $(CLEANEXEDBGFILES)'#010+
   'endif'#010+
   'ifdef CLEANPPUFILES'#010+
@@ -2287,9 +2309,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifneq ($(CLEANPPULINKFILES),)'#010+
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
-  'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(addprefix $(UNI','TTARGETDIRPREFIX),$(CLEANRSTFILES))'+
-  #010+
+  'ifdef CLEANRS','TFILES'#010+
+  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
   'endif'#010+
   'ifdef CLEAN_FILES'#010+
   '        -$(DEL) $(CLEAN_FILES)'#010+
@@ -2297,15 +2318,16 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifdef LIB_NAME'#010+
   '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
   'endif'#010+
-  '        -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+
-  '        ','-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_s'+
-  'cript.res *_link.res'#010+
+  '        -$(DEL) $(FPCMADE) *$(FULL_TAR','GET).fpm Package.fpc *$(ASMEXT'+
+  ')'#010+
+  '        -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
+  'ipt.res *_link.res'#010+
   '        -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+
   'TCHEXT)'#010+
   #010+
   'fpc_cleanall: $(CLEANTARGET)'#010+
-  'ifdef CLEANEXEFILES'#010+
-  '        -$(DEL) $(CLEANEXEFILES',')'#010+
+  'ifdef CLEAN','EXEFILES'#010+
+  '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   'ifdef COMPILER_UNITTARGETDIR'#010+
   'ifdef CLEANPPUFILES'#010+
@@ -2315,7 +2337,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),','$(CLEANRSTFILES))'+
+  '        -$(','DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+
   #010+
   'endif'#010+
   'endif'#010+
@@ -2324,17 +2346,17 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   '        -$(DELTREE) units'#010+
   '        -$(DELTREE) bin'#010+
-  '        -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+
-  '$(STATICLIBEXT) *$(SHAREDLIBEXT) *$','(PPLEXT)'#010+
+  '        -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASME','XT)'+
+  ' *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
   'ifneq ($(PPUEXT),.ppu)'#010+
   '        -$(DEL) *.o *.ppu *.a'#010+
   'endif'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
   '        -$(DEL) fpcmade.* Package.fpc *.fpm'#010+
-  '        -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
-  'ipt.res *_link.res'#010+
-  '      ','  -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$('+
-  'BATCHEXT)'#010+
+  '        -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res ','link*.res *_s'+
+  'cript.res *_link.res'#010+
+  '        -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+
+  'TCHEXT)'#010+
   'ifdef AOUTEXT'#010+
   '        -$(DEL) *$(AOUTEXT)'#010+
   'endif'#010+
@@ -2342,8 +2364,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '        -$(DEL) *$(DEBUGSYMEXT)'#010+
   'endif'#010+
   'ifdef LOCALFPMAKEBIN'#010+
-  '        -$(DEL) $(LOCALFPMAKEBIN)'#010+
-  '        -','$(DEL) $(FPMAKEBINOBJ)'#010+
+  '   ','     -$(DEL) $(LOCALFPMAKEBIN)'#010+
+  '        -$(DEL) $(FPMAKEBINOBJ)'#010+
   'endif'#010+
   #010+
   'fpc_distclean: cleanall'#010+
@@ -2352,9 +2374,10 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '[baseinforules]'#010+
   '#####################################################################'#010+
   '# Base info rules'#010+
-  '#####################################################################'#010+
+  '########################################','############################'+
+  '#'#010+
   #010+
-  '.PHONY: f','pc_baseinfo'#010+
+  '.PHONY: fpc_baseinfo'#010+
   #010+
   'override INFORULES+=fpc_baseinfo'#010+
   #010+
@@ -2362,95 +2385,96 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Package info =='#010+
   '        @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#010+
-  '        @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#010+
+  '        @$(ECHO)  Package Version','.. $(PACKAGE_VERSION)'#010+
   '        @$(ECHO)'#010+
-  ' ','       @$(ECHO)  == Configuration info =='#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 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)  S','ourceSuffix. $(SOURCESUFFIX)'#010+
+  '        @$(ECHO)  TargetSuffix. $(TARGETSUFFIX)'#010+
   '        @$(ECHO)  FPC fpmake... $(FPCFPMAKE)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Directory info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)'#010+
+  '        @$(ECHO)  Required pkgs... $(REQUIRE_','PACKAGES)'#010+
   '        @$(ECHO)'#010+
-  '        @$(EC','HO)  Basedir......... $(BASEDIR)'#010+
+  '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
   '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#010+
   '        @$(ECHO)  CrossBinDir..... $(CROSSBINDIR)'#010+
   '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#010+
-  '        @$(ECHO)  PackagesDir..... $(PACKAGESDIR)'#010+
-  '        @$(ECHO',')'#010+
+  '        @$(ECHO)  Package','sDir..... $(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)  As........ $(','AS)'#010+
   '        @$(ECHO)  Ld........ $(LD)'#010+
-  ' ','       @$(ECHO)  Ar........ $(AR)'#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.. $(GINSTA','LL)'#010+
+  '        @$(ECHO)  Rm........ $(RMPRO','G)'#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)  Zip....... $(ZIPPROG)'#010+
-  '    ','    @$(ECHO)'#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_IMPLICIT','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_EXAMPLE','DIRS)'#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)  Install Units....... $(INSTALL_UNI','TS)'#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............ $(ZIPPR','EFIX)'#010+
+  '       ',' @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#010+
   '        @$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
   '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
   '        @$(ECHO)  FullZipName.......... $(FULLZIPNAME)'#010+
-  '        @$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
-  '      ','  @$(ECHO)'#010+
+  '        @$(ECHO)  Install FP','C 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_UNIT','DIR)'#010+
+  '        @$(ECH','O)  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_DATA','DIR)'#010+
+  '        @$(ECH','O)  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+
+  '# Info rules'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_info'#010+
@@ -2458,37 +2482,37 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'fpc_info: $(INFORULES)'#010+
   #010+
   '[makefilerules]'#010+
-  '#####################################################################'#010+
-  '# Rebuild Makefile'#010+
-  '###############','#####################################################'+
+  '################################################################','####'+
   '#'#010+
+  '# Rebuild Makefile'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
   ' \'#010+
   '        fpc_makefile_dirs'#010+
   #010+
   'fpc_makefile:'#010+
-  '        $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
+  '        $(FPCMAKE) -w -T$(OS_T','ARGET) Makefile.fpc'#010+
   #010+
-  'fpc_makefile_sub1:'#010,
+  'fpc_makefile_sub1:'#010+
   'ifdef TARGET_DIRS'#010+
   '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
   'T_DIRS))'#010+
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
   '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
-  'T_EXAMPLEDIRS))'#010+
+  'T_','EXAMPLEDIRS))'#010+
   'endif'#010+
   #010+
-  'fpc_makefile_sub2: ','$(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+
-  'T_EXAMPLEDIRS))'#010+
+  'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
+  'EXAMPLEDIRS))'#010+
   #010+
   'fpc_makefile_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+
@@ -2499,7 +2523,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   #010+
   '[userrules]'#010+
-  '################################################################','####'+
+  '########################','############################################'+
   '#'#010+
   '# Users rules'#010+
   '#####################################################################'#010+
@@ -2507,7 +2531,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '[lclrules]'#010+
   '#####################################################################'#010+
   '# LCL Rules'#010+
-  '########################################################','############'+
+  '################','####################################################'+
   '#'#010+
   #010+
   '# LCL Platform'#010+
@@ -2520,9 +2544,9 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   'export LCL_PLATFORM'#010+
   #010+
-  '# Check if the specified LCLDIR is correct'#010+
+  '# Check if the specified LCLDIR ','is correct'#010+
   'ifdef LCLDIR'#010+
-  'override LCLDIR:','=$(subst \,/,$(LCLDIR))'#010+
+  'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
   'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
@@ -2531,8 +2555,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'endif'#010+
   #010+
   '# Check if the default LCLDIR is correct'#010+
-  'ifdef DEFAULT_LCLDIR'#010+
-  'override LCLDIR:=$(subst \,/,$(DEFAULT_L','CLDIR))'#010+
+  'ifdef DEFAULT_LCLDIR'#010,
+  'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
   'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
@@ -2540,8 +2564,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# Check for development version'#010+
   'ifeq ($(LCLDIR),wrong)'#010+
-  'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
-  ' $(addsuffix /units/','$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
+  'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(','firstword $(wildca'+
+  'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
   'ifeq ($(LCLDIR),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
@@ -2549,8 +2573,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   '# Check for release version'#010+
   'ifeq ($(LCLDIR),wrong)'#010+
-  'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
-  ' $(addsuffix /lib/la','zarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
+  'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(','firstword $(wildca'+
+  'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
   'ifeq ($(LCLDIR),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
@@ -2559,17 +2583,16 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '# Generate dirs'#010+
   'override LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDI'+
   'R)/units)'#010+
-  'override LCLCOMPONENTDIR=$(wildcard $(LCLDI','R)/.. $(LCLDIR)/../compon'+
+  'ove','rride LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compon'+
   'ents $(LCLDIR)/components)'#010+
   'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
   #010+
   '# Add LCL dirs to paths'#010+
   'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
-  'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
+  'override COMPILER_UNITDIR+=$(LCLU','NITDIR)'#010+
   #010+
   '[lclinforules]'#010+
-  '################','####################################################'+
-  '#'#010+
+  '#####################################################################'#010+
   '# LCL Info rules'#010+
   '#####################################################################'#010+
   'override INFORULES+=lclinfo'#010+
@@ -2577,20 +2600,20 @@ const fpcmakeini : array[0..260,1..240] of char=(
   '.PHONY: lclinfo'#010+
   #010+
   'lclinfo:'#010+
-  '        @$(ECHO)  == LCL info =='#010+
-  '        @$(','ECHO)'#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+
+  '        @$(ECHO)  LCL Component di','r.... $(LCLCOMPONENTDIR)'#010+
+  '        @$(ECHO)'#010+
   #010+
   '[fpmakeprerules]'#010+
   '#####################################################################'#010+
   '# fpmake prerules'#010+
   '#####################################################################'#010+
-  'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+
-  'FPMAKEBINOBJ=fpmake$(OEXT) fpmake','$(LTOEXT)'#010+
+  'FPMAKEBIN=fpmake$(SRCE','XEEXT)'#010+
+  'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+
   'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+
   #010+
   '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+
@@ -2598,51 +2621,52 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'ifdef OS_TARGET'#010+
   'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+
   'endif'#010+
-  'ifdef CPU_TARGET'#010+
-  'FPC_TARGETOPT+=--cpu=$(CPU_TARGET',')'#010+
+  'ifdef CPU_','TARGET'#010+
+  'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+
   'endif'#010+
   #010+
   '# Get the location of the bootstrap-fpmkunit units'#010+
   'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+
   'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+
-  'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+
-  'UNITDIR_FPMAKE_FPM','KUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+
-  'IX)'#010+
+  'ifneq ($(P','ACKAGEDIR_FPMKUNIT),)'#010+
+  'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+
+  ')'#010+
   'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+
   'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+
-  'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+
+  'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMK','UNIT)/fpmkunit.ppu'#010+
   'endif'#010+
   #010+
-  'ifdef FPMAKE_S','KIP_CONFIG'#010+
+  'ifdef FPMAKE_SKIP_CONFIG'#010+
   'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+
   'endif'#010+
   #010+
   '[fpmakerules]'#010+
   '#####################################################################'#010+
   '# fpmake rules'#010+
-  '#####################################################################'#010+
-  '.PHO','NY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_ex'+
-  'ampleinstall'#010+
+  '##################################','##################################'+
+  '#'#010+
+  '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+
+  'pleinstall'#010+
   #010+
   '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+
   'ake uses it'#039's own.'#010+
-  'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+
-  'override FPCOPT:=$(filter-out -','FE%,$(FPCOPT))'#010+
+  'override FPCOPT:=$(filter-out -FU%,$(','FPCOPT))'#010+
+  'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+
   '# Compose general fpmake-parameters'#010+
   'ifdef FPMAKEOPT'#010+
   'FPMAKE_OPT+=$(FPMAKEOPT)'#010+
   'endif'#010+
   'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+
   'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+
-  'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+
-  'FPMAKE_OPT+=$(addprefix -o ,$','(FPCOPT))'#010+
+  'FPMAKE_OPT+=$(FPC_','TARGETOPT)'#010+
+  'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+
   'FPMAKE_OPT+=--compiler=$(FPC)'#010+
   'FPMAKE_OPT+=-bu'#010+
   #010+
   'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+
   'ifdef UNIXHier'#010+
   'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+
-  'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_','VER'+
+  'FPMAKE_INSTALL_OPT+=--bas','einstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VER'+
   'SION)'#010+
   'else'#010+
   'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+
@@ -2650,22 +2674,22 @@ const fpcmakeini : array[0..260,1..240] of char=(
   #010+
   'override ALLTARGET+=fpc_fpmake'#010+
   'override INSTALLTARGET+=fpc_fpmake_install'#010+
-  'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+
-  '# If no fpmake exists and (dist)clean is',' called, do not try to build'+
-  ' fpmake, it will'#010+
+  'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010,
+  '# If no fpmake exists and (dist)clean is called, do not try to build f'+
+  'pmake, it will'#010+
   '# most often fail because the dependencies are cleared.'#010+
   '# In case of a clean, simply do nothing'#010+
   'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+
-  'override CLEANTARGET+=fpc_fpmake_clean'#010+
+  'override CLEANTARGET','+=fpc_fpmake_clean'#010+
   'endif'#010+
   #010+
-  '$(FPMKUNIT_PPU','): $(FPMKUNIT_SRC)'#010+
+  '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+
   '            $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+
   'T=,$(FPMAKE_BUILD_OPT))'#010+
   #010+
   '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+
-  '        $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+
-  'IR)) $(FPMAKE_BU','ILD_OPT)'#010+
+  '        $(FPCFPMAKE) fpmake.pp $(addprefix -Fu',',$(COMPILER_FPMAKE_UNI'+
+  'TDIR)) $(FPMAKE_BUILD_OPT)'#010+
   #010+
   'fpc_fpmake: $(FPMAKEBIN)'#010+
   '            $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+
@@ -2673,15 +2697,15 @@ const fpcmakeini : array[0..260,1..240] of char=(
   'fpc_fpmake_clean: $(FPMAKEBIN)'#010+
   '            $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+
   #010+
-  'fpc_fpmake_install: $(FPMAKEBIN)'#010+
-  '            $(LOCALFPMAKEBIN) install',' $(FPMAKE_OPT) $(FPMAKE_INSTALL'+
-  '_OPT)'#010+
+  'fpc_fpmake_install: $(FPMAKEBI','N)'#010+
+  '            $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+
+  'PT)'#010+
   #010+
   '# This is not completely valid. Exampleinstall should only install the'+
   ' examples, while'#010+
   '# fpmake -ie installs everything, including the examples. This also me'+
-  'ans that on'#010+
-  '# a distinstall fpmake install wi','l be called twice.'#010+
+  'ans t','hat on'#010+
+  '# a distinstall fpmake install wil be called twice.'#010+
   'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+
   '            $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+
   'LL_OPT)'#010
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index f0a3f9674f..a0bfabb94a 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -910,12 +910,12 @@ endif
 #CPU_TARGET=mips,mipsel
 ifeq ($(BINUTILSPREFIX),)
 ifeq ($(GCCLIBDIR),)
-GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
+GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)
 endif
 #GCCLIBDIR=
 else
 ifeq ($(CROSSGCCOPT),)
-CROSSGCCOPT=-m32
+CROSSGCCOPT=-g
 endif
 #CROSSGCCOPT=
 endif