* -O1r -> -O2 for ppc release

git-svn-id: trunk@2942 -

utils/fpcm/fpcmake.inc

@@ -1331,7 +1331,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'FPCCPUOPT:=-OG2p3'#010+
   'else'#010+
   'ifeq ($(CPU_TARGET),powerpc)'#010+
-  'FPCCPU','OPT:=-O1r'#010+
+  'FPCCPU','OPT:=-O2'#010+
   'else'#010+
   'FPCCPUOPT:='#010+
   'endif'#010+
@@ -1348,7 +1348,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '# Optimizer (i386 only for now)'#010+
   'ifdef OPTIMIZE'#010+
   'ifeq ($(CPU_TARGET),i386)'#010+
-  'over','ride FPCOPT+=-OG2p3'#010+
+  'overr','ide FPCOPT+=-OG2p3'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1362,7 +1362,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
   'endif'#010+
   'ifdef COMPILER_UNITDIR'#010+
-  'override ','FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
+  'override F','PCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
   'endif'#010+
   'ifdef COMPILER_LIBRARYDIR'#010+
   'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
@@ -1370,7 +1370,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ifdef COMPILER_OBJECTDIR'#010+
   'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
   'endif'#010+
-  'ifdef COMPILE','R_INCLUDEDIR'#010+
+  'ifdef COMPILER','_INCLUDEDIR'#010+
   'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
   'endif'#010+
   #010+
@@ -1381,7 +1381,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   '# Target dirs and the prefix to use for clean/install'#010+
   'ifdef COMPILER_TARGETDIR'#010+
-  'o','verride FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
+  'ov','erride FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
   'ifeq ($(COMPILER_TARGETDIR),.)'#010+
   'override TARGETDIRPREFIX='#010+
   'else'#010+
@@ -1390,7 +1390,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   #010+
   '# Unit target dir (default is units/<cpu>-<os>/'#010+
-  'ifdef COMPILER_UNITTARGETDIR',#010+
+  'ifdef COMPILER_UNITTARGETDIR'#010,
   'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
   'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
   'override UNITTARGETDIRPREFIX='#010+
@@ -1399,7 +1399,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   'else'#010+
   'ifdef COMPILER_TARGETDIR'#010+
-  'override COMPILER_UNITTARGETDIR','=$(COMPILER_TARGETDIR)'#010+
+  'override COMPILER_UNITTARGETDIR=','$(COMPILER_TARGETDIR)'#010+
   'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
   'endif'#010+
   'endif'#010+
@@ -1409,7 +1409,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ifeq ($(FPC_VERSION),1.0.6)'#010+
   'override FPCOPTDEF+=HASUNIX'#010+
   'endif'#010+
-  'endi','f'#010+
+  'endif',#010+
   #010+
   'ifdef CREATESHARED'#010+
   'override FPCOPT+=-Cg'#010+
@@ -1428,7 +1428,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '[command_libc]'#010+
   '# Add GCC lib path if asked'#010+
   'ifdef GCCLIBDIR'#010+
-  'ov','erride FPCOPT+=-Fl$(GCCLIBDIR)'#010+
+  'ove','rride FPCOPT+=-Fl$(GCCLIBDIR)'#010+
   'endif'#010+
   'ifdef OTHERLIBDIR'#010+
   'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+
@@ -1441,7 +1441,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'override FPCOPT+=$(OPT)'#010+
   'endif'#010+
   #010+
-  '# Add defines from FP','COPTDEF to FPCOPT'#010+
+  '# Add defines from FPC','OPTDEF to FPCOPT'#010+
   'ifdef FPCOPTDEF'#010+
   'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
   'endif'#010+
@@ -1453,7 +1453,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   '# Use the environment to pass commandline options?'#010+
   'ifdef USEENV'#010+
-  'overrid','e FPCEXTCMD:=$(FPCOPT)'#010+
+  'override',' FPCEXTCMD:=$(FPCOPT)'#010+
   'override FPCOPT:=!FPCEXTCMD'#010+
   'export FPCEXTCMD'#010+
   'endif'#010+
@@ -1463,7 +1463,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+
   'override ACROSSCOMPILE=1'#010+
-  'e','ndif'#010+
+  'en','dif'#010+
   #010+
   'ifdef ACROSSCOMPILE'#010+
   'override FPCOPT+=$(CROSSOPT)'#010+
@@ -1474,7 +1474,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   '# also call ppas if with command option -s'#010+
   '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+
-  'ifeq (,$(findstring',' -s ,$(COMPILER)))'#010+
+  'ifeq (,$(findstring ','-s ,$(COMPILER)))'#010+
   'EXECPPAS='#010+
   'else'#010+
   'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+
@@ -1486,7 +1486,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '[loaderrules]'#010+
   '#####################################################################'#010+
   '# Loaders'#010+
-  '##########################################','##########################'+
+  '###########################################','#########################'+
   '#'#010+
   #010+
   '.PHONY: fpc_loaders'#010+
@@ -1496,7 +1496,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'override CLEANTARGET+=fpc_loaders_clean'#010+
   'override INSTALLTARGET+=fpc_loaders_install'#010+
   #010+
-  'override LOADEROFILES:=$(addsuffix $(OEXT),$(T','ARGET_LOADERS))'#010+
+  'override LOADEROFILES:=$(addsuffix $(OEXT),$(TA','RGET_LOADERS))'#010+
   'endif'#010+
   #010+
   '%$(OEXT): %$(LOADEREXT)'#010+
@@ -1508,7 +1508,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+
   #010+
-  'fpc_loader','s_clean:'#010+
+  'fpc_loaders','_clean:'#010+
   'ifdef COMPILER_UNITTARGETDIR'#010+
   '        -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+
   ')'#010+
@@ -1518,17 +1518,17 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   'fpc_loaders_install:'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010,
-  '        $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+
-  'ES)) $(INSTALL_UNITDIR)'#010+
+  'ifdef COMPILER_UNITTARGETDIR'#010+
+  ' ','       $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+
+  'ILES)) $(INSTALL_UNITDIR)'#010+
   'else'#010+
   '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
   'endif'#010+
   #010+
   #010+
   '[unitrules]'#010+
-  '###################################################################','#'+
-  '#'#010+
+  '####################################################################','#'+
+  #010+
   '# Units'#010+
   '#####################################################################'#010+
   #010+
@@ -1538,13 +1538,13 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'override ALLTARGET+=fpc_units'#010+
   #010+
   'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
-  'override IMPLICITUNITP','PUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+
+  'override IMPLICITUNITPP','UFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+
   'TUNITS))'#010+
   'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
   'endif'#010+
   #010+
-  'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFI','LES)'#010+
+  'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFIL','ES)'#010+
   #010+
   #010+
   '[exerules]'#010+
@@ -1555,12 +1555,12 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '.PHONY: fpc_exes'#010+
   #010+
   '# Programs are not needed for a cross installation'#010+
-  'ifnde','f CROSSINSTALL'#010+
+  'ifndef',' CROSSINSTALL'#010+
   'ifneq ($(TARGET_PROGRAMS),)'#010+
   'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
   'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
-  'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)',')'+
-  ')'#010+
+  'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))',')'+
+  #010+
   #010+
   'override ALLTARGET+=fpc_exes'#010+
   'override INSTALLEXEFILES+=$(EXEFILES)'#010+
@@ -1568,7 +1568,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ifeq ($(OS_TARGET),os2)'#010+
   'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
   'endif'#010+
-  'ifeq ($(OS_TARGET),emx)',#010+
+  'ifeq ($(OS_TARGET),emx)'#010,
   'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
   'endif'#010+
   'endif'#010+
@@ -1578,8 +1578,8 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   #010+
   '[rstrules]'#010+
-  '#####################################################################'#010,
-  '# Resource strings'#010+
+  '#####################################################################'#010+
+  '#',' Resource strings'#010+
   '#####################################################################'#010+
   #010+
   'ifdef TARGET_RSTS'#010+
@@ -1590,7 +1590,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   #010+
   '[examplerules]'#010+
-  '################','####################################################'+
+  '#################','###################################################'+
   '#'#010+
   '# Examples'#010+
   '#####################################################################'#010+
@@ -1599,17 +1599,17 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   'ifneq ($(TARGET_EXAMPLES),)'#010+
   'HASEXAMPLES=1'#010+
-  'override EXAMPLESOURCEFILES:=$(wildcard ','$(addsuffix .pp,$(TARGET_EXA'+
+  'override EXAMPLESOURCEFILES:=$(wildcard $','(addsuffix .pp,$(TARGET_EXA'+
   'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+
   '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+
   'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
-  'override EXAMPLEOFILES:=$(a','ddsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+
+  'override EXAMPLEOFILES:=$(ad','dsuffix $(OEXT),$(TARGET_EXAMPLES)) $(ad'+
   'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+
   'ES)))'#010+
   #010+
   'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
   'ifeq ($(OS_TARGET),os2)'#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOU','TEXT),$(TARGET_EXAMPLES))'#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUT','EXT),$(TARGET_EXAMPLES))'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),emx)'#010+
   'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
@@ -1619,7 +1619,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'HASEXAMPLES=1'#010+
   'endif'#010+
   #010+
-  'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(','TARGET_EXAMPLED'+
+  'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(T','ARGET_EXAMPLED'+
   'IRS))'#010+
   #010+
   #010+
@@ -1628,7 +1628,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '# General compile rules'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_all fpc_smart fpc_debug f','pc_release fpc_shared'#010+
+  '.PHONY: fpc_all fpc_smart fpc_debug fp','c_release fpc_shared'#010+
   #010+
   '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
   '        @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
@@ -1641,7 +1641,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'fpc_debug:'#010+
   '        $(MAKE) all DEBUG=1'#010+
   #010+
-  'fpc_relea','se:'#010+
+  'fpc_releas','e:'#010+
   '        $(MAKE) all RELEASE=1'#010+
   #010+
   '# General compile rules, available for both possible .pp and .pas exte'+
@@ -1650,7 +1650,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+
   #010+
   '$(COMPILER_UNITTARGETDIR):'#010+
-  '        $(MKDIRTREE) $(COMPILER_','UNITTARGETDIR)'#010+
+  '        $(MKDIRTREE) $(COMPILER_U','NITTARGETDIR)'#010+
   #010+
   '$(COMPILER_TARGETDIR):'#010+
   '        $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
@@ -1664,7 +1664,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.pp'#010+
-  '        $(COMPILE','R) $<'#010+
+  '        $(COMPILER',') $<'#010+
   '        $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.pas'#010+
@@ -1680,20 +1680,20 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        $(EXECPPAS)'#010+
   #010+
   '%.res: %.rc'#010+
-  '        windres',' -i $< -o $@'#010+
+  '        windres ','-i $< -o $@'#010+
   #010+
   '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+
   'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %.d','pr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+  'vpath %.dp','r $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
   'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
   #010+
   '[sharedrules]'#010+
   '#####################################################################'#010+
   '# Library'#010+
-  '#############','#######################################################'+
+  '##############','######################################################'+
   '#'#010+
   #010+
   '.PHONY: fpc_shared'#010+
@@ -1705,8 +1705,8 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   #010+
   'ifndef SHARED_LIBNAME'#010+
-  'SHARED_LIBNAME=$(PACKAGE_NAME)'#010,
-  'endif'#010+
+  'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+
+  'e','ndif'#010+
   #010+
   'ifndef SHARED_FULLNAME'#010+
   'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+
@@ -1715,7 +1715,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   '# Default sharedlib units are all unit objects'#010+
   'ifndef SHARED_LIBUNITS'#010+
-  'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMP','LICITUNITS)'#010+
+  'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPL','ICITUNITS)'#010+
   'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+
   'IBUNITS))'#010+
   'endif'#010+
@@ -1724,7 +1724,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ifdef HASSHAREDLIB'#010+
   '        $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
   'ifneq ($(SHARED_BUILD),n)'#010+
-  '        $(PPUMOVE) -q ','$(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+
+  '        $(PPUMOVE) -q $','(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+
   ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+
   'endif'#010+
   'else'#010+
@@ -1734,7 +1734,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'fpc_shared_install:'#010+
   'ifneq ($(SHARED_BUILD),n)'#010+
   'ifneq ($(SHARED_LIBUNITS),)'#010+
-  'ifne','q ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
+  'ifneq',' ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
   '        $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
   'ALL_SHAREDDIR)'#010+
   'endif'#010+
@@ -1742,7 +1742,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   #010+
   '[installrules]'#010+
-  '###########################################################','#########'+
+  '############################################################','########'+
   '#'#010+
   '# Install rules'#010+
   '#####################################################################'#010+
@@ -1750,7 +1750,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
   #010+
   'ifdef INSTALL_UNITS'#010+
-  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS)',')'#010+
+  'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))',#010+
   'endif'#010+
   #010+
   'ifdef INSTALL_BUILDUNIT'#010+
@@ -1760,12 +1760,12 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   'ifdef INSTALLPPUFILES'#010+
   'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
-  'LES)) $(addprefix $','(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+
+  'LES)) $(addprefix $(','STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+
   'T),$(INSTALLPPUFILES)))'#010+
   'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
   'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+
   '$(INSTALLPPUFILES)))'#010+
-  'override INSTALLPPULINKFILES:=$(wildcard $(a','ddprefix $(UNITTARGETDIR'+
+  'override INSTALLPPULINKFILES:=$(wildcard $(ad','dprefix $(UNITTARGETDIR'+
   'PREFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+
   'endif'#010+
   '# Implicitly install Package.fpc'#010+
@@ -1774,7 +1774,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   'ifdef INSTALLEXEFILES'#010+
   'ifneq ($(TARGETDIRPREFIX),)'#010+
-  'override INSTALLEXEFILES:=$(addprefix $(T','ARGETDIRPREFIX),$(notdir $('+
+  'override INSTALLEXEFILES:=$(addprefix $(TA','RGETDIRPREFIX),$(notdir $('+
   'INSTALLEXEFILES)))'#010+
   'endif'#010+
   'endif'#010+
@@ -1784,7 +1784,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        $(MKDIR) $(INSTALL_BINDIR)'#010+
   '# Compress the exes if upx is defined'#010+
   'ifdef UPXPROG'#010+
-  '        -$(UPXPROG) $(INSTALLEXEFILES)',#010+
+  '        -$(UPXPROG) $(INSTALLEXEFILES)'#010,
   'endif'#010+
   '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
   'endif'#010+
@@ -1792,7 +1792,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '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 availa','ble'#010+
+  '# a safety check is done if Makefile.fpc is availab','le'#010+
   'ifdef PACKAGE_VERSION'#010+
   'ifneq ($(wildcard Makefile.fpc),)'#010+
   '        $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
@@ -1802,13 +1802,13 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'endif'#010+
-  'ifdef ','INSTALLPPUFILES'#010+
+  'ifdef I','NSTALLPPUFILES'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
   '        $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
   'ifneq ($(INSTALLPPULINKFILES),)'#010+
   '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
   'endif'#010+
-  'ifneq ($(wildcard $(LIB_FULLNAME',')),)'#010+
+  'ifneq ($(wildcard $(LIB_FULLNAME)','),)'#010+
   '        $(MKDIR) $(INSTALL_LIBDIR)'#010+
   '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
   'ifdef inUnix'#010+
@@ -1817,7 +1817,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'ifdef INSTALL_FILES'#010+
-  '        $(MKDIR) $(INSTALL_DATADIR)',#010+
+  '        $(MKDIR) $(INSTALL_DATADIR)'#010,
   '        $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
   'endif'#010+
   #010+
@@ -1825,7 +1825,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
   '        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
   #010+
-  'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXA','MPLEDIRS))'#010+
+  'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAM','PLEDIRS))'#010+
   'ifdef HASEXAMPLES'#010+
   '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
@@ -1833,7 +1833,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
-  '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPL','EDIRS)) $(INSTALL_'+
+  '        $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLE','DIRS)) $(INSTALL_'+
   'EXAMPLEDIR)'#010+
   'endif'#010+
   #010+
@@ -1844,7 +1844,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   '.PHONY: fpc_distinstall'#010+
   #010+
-  'fpc','_distinstall: install exampleinstall'#010+
+  'fpc_','distinstall: install exampleinstall'#010+
   #010+
   #010+
   '[zipinstallrules]'#010+
@@ -1852,7 +1852,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '# Zip'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_zipinstall fpc_zipsource','install fpc_zipexampleinstall'#010+
+  '.PHONY: fpc_zipinstall fpc_zipsourcei','nstall fpc_zipexampleinstall'#010+
   #010+
   '# Temporary 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+
@@ -1860,7 +1860,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ifndef inUnix'#010+
   'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
   'else'#010+
-  'PACKDIR=/tmp/fpc-pa','ck'#010+
+  'PACKDIR=/tmp/fpc-pac','k'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1874,7 +1874,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   #010+
   'ifndef FULLZIPNAME'#010+
-  'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPS','UFFIX)'#010+
+  'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSU','FFIX)'#010+
   'endif'#010+
   #010+
   '# ZipTarget'#010+
@@ -1893,7 +1893,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Use a wrapper script by default',' for Os/2'#010+
+  '# Use a wrapper script by default ','for Os/2'#010+
   'ifndef inUnix'#010+
   'USEZIPWRAPPER=1'#010+
   'endif'#010+
@@ -1904,7 +1904,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ZIPPATHSEP=$(PATHSEP)'#010+
   'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
   'else'#010+
-  'ZI','PPATHSEP=/'#010+
+  'ZIP','PATHSEP=/'#010+
   'endif'#010+
   #010+
   '# Create commands to create the zip/tar file'#010+
@@ -1912,7 +1912,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
   'ifdef USETAR'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
-  'ZIP','CMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
+  'ZIPC','MD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
   'else'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
   'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
@@ -1920,13 +1920,13 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   #010+
   'fpc_zipinstall:'#010+
-  '        $(MAKE) $(ZIPTARGET) IN','STALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
+  '        $(MAKE) $(ZIPTARGET) INS','TALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
   '        $(MKDIR) $(DIST_DESTDIR)'#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))" > $(ZIPWRAP'+
+  '        $(ECHOREDIR) -e "$(subst \,\\,$(','ZIPCMD_CDPACK))" > $(ZIPWRAP'+
   'PER)'#010+
   '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
   #010+
@@ -1934,7 +1934,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ER)'#010+
   'else'#010+
   '        echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
-  '        ec','ho $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
+  '        ech','o $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
   '        echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
   'endif'#010+
   'ifdef inUnix'#010+
@@ -1944,7 +1944,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   '        $(DEL) $(ZIPWRAPPER)'#010+
   'else'#010+
-  '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; ','$(ZIPCMD_CDBASE)'#010+
+  '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $','(ZIPCMD_CDBASE)'#010+
   'endif'#010+
   '        $(DELTREE) $(PACKDIR)'#010+
   #010+
@@ -1954,7 +1954,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   'fpc_zipexampleinstall:'#010+
   'ifdef HASEXAMPLES'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARG','ET=exampleinstall ZIPSUFFIX=$('+
+  '        $(MAKE) fpc_zipinstall ZIPTARGE','T=exampleinstall ZIPSUFFIX=$('+
   'ZIPEXAMPLESUFFIX)'#010+
   'endif'#010+
   #010+
@@ -1965,7 +1965,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '[cleanrules]'#010+
   '#####################################################################'#010+
   '# Clean rules'#010+
-  '#############','#######################################################'+
+  '##############','######################################################'+
   '#'#010+
   #010+
   '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
@@ -1976,21 +1976,21 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   #010+
   'ifdef CLEAN_UNITS'#010+
-  'override CLEANPPUFILES+','=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
+  'override CLEANPPUFILES+=','$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
   'endif'#010+
   #010+
   'ifdef CLEANPPUFILES'#010+
   'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
   ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
   'LEANPPUFILES)))'#010+
-  'ifdef DEBUGSYMEXT'#010,
-  'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
-  'UFILES))'#010+
+  'ifdef DEBUGSYMEXT'#010+
+  'o','verride CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+
+  'PPUFILES))'#010+
   'endif'#010+
   'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
   'ILES))'#010+
   'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
-  'IX),$(CL','EANPPULINKFILES)))'#010+
+  'IX),$(CLE','ANPPULINKFILES)))'#010+
   'endif'#010+
   #010+
   'fpc_clean: $(CLEANTARGET)'#010+
@@ -2002,7 +2002,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'endif'#010+
   'ifneq ($(CLEANPPULINKFILES),)'#010+
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
-  'end','if'#010+
+  'endi','f'#010+
   'ifdef CLEANRSTFILES'#010+
   '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
   'endif'#010+
@@ -2012,7 +2012,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ifdef LIB_NAME'#010+
   '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
   'endif'#010+
-  '        -$(DEL) $(FPCM','ADE) Package.fpc $(PPAS) script.res link.res $'+
+  '        -$(DEL) $(FPCMA','DE) Package.fpc $(PPAS) script.res link.res $'+
   '(FPCEXTFILE) $(REDIRFILE)'#010+
   '        -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
   #010+
@@ -2021,7 +2021,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
   'ifdef COMPILER_UNITTARGETDIR'#010+
-  'ifdef',' CLEANPPUFILES'#010+
+  'ifdef ','CLEANPPUFILES'#010+
   '        -$(DEL) $(CLEANPPUFILES)'#010+
   'endif'#010+
   'ifneq ($(CLEANPPULINKFILES),)'#010+
@@ -2031,14 +2031,14 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
   'endif'#010+
   'endif'#010+
-  '        -$(D','ELTREE) units'#010+
+  '        -$(DE','LTREE) units'#010+
   '        -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
   'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
   'ifneq ($(PPUEXT),.ppu)'#010+
   '        -$(DEL) *.o *.ppu *.a'#010+
   'endif'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
-  '        -$(DEL) fpcmade.* Packa','ge.fpc $(PPAS) script.res link.res $('+
+  '        -$(DEL) fpcmade.* Packag','e.fpc $(PPAS) script.res link.res $('+
   'FPCEXTFILE) $(REDIRFILE)'#010+
   '        -$(DEL) *_ppas$(BATCHEXT)'#010+
   'ifdef AOUTEXT'#010+
@@ -2051,7 +2051,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'fpc_distclean: cleanall'#010+
   #010+
   #010+
-  '[baseinforule','s]'#010+
+  '[baseinforules',']'#010+
   '#####################################################################'#010+
   '# Base info rules'#010+
   '#####################################################################'#010+
@@ -2061,37 +2061,37 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'override INFORULES+=fpc_baseinfo'#010+
   #010+
   'fpc_baseinfo:'#010+
-  '        ','@$(ECHO)'#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.......... $(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)  Target OS.','... $(OS_TARGET)'#010+
   '        @$(ECHO)  Full Source.. $(FULL_SOURCE)'#010+
   '        @$(ECHO)  Full Target.. $(FULL_TARGET)'#010+
   '        @$(ECHO)  SourceSuffix. $(SOURCESUFFIX)'#010+
   '        @$(ECHO)  TargetSuffix. $(TARGETSUFFIX)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO',')  == Directory info =='#010+
+  '        @$(ECHO)','  == Directory info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Basedir......... $(BASEDIR)'#010+
   '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#010+
-  '        @$(ECHO)  CrossBinDir..... $','(CROSSBINDIR)'#010+
+  '        @$(ECHO)  CrossBinDir..... $(','CROSSBINDIR)'#010+
   '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#010+
   '        @$(ECHO)  PackagesDir..... $(PACKAGESDIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  GCC library..... $(GCCLIBDIR)'#010+
   '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
-  '        @$(ECH','O)'#010+
+  '        @$(ECHO',')'#010+
   '        @$(ECHO)  == Tools info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  As........ $(AS)'#010+
@@ -2099,13 +2099,13 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        @$(ECHO)  Ar........ $(AR)'#010+
   '        @$(ECHO)  Rc........ $(RC)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Mv........',' $(MVPROG)'#010+
+  '        @$(ECHO)  Mv........ ','$(MVPROG)'#010+
   '        @$(ECHO)  Cp........ $(CPPROG)'#010+
   '        @$(ECHO)  Rm........ $(RMPROG)'#010+
   '        @$(ECHO)  GInstall.. $(GINSTALL)'#010+
   '        @$(ECHO)  Echo...... $(ECHO)'#010+
   '        @$(ECHO)  Shell..... $(SHELL)'#010+
-  '        @$(ECHO)  Date...... $(DATE',')'#010+
+  '        @$(ECHO)  Date...... $(DATE)',#010+
   '        @$(ECHO)  FPCMake... $(FPCMAKE)'#010+
   '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
   '        @$(ECHO)  Upx....... $(UPXPROG)'#010+
@@ -2113,48 +2113,48 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Object info =='#010+
   '        @$(ECHO)'#010+
-  '        ','@$(ECHO)  Target Loaders........ $(TARGET_LOADERS)'#010+
+  '        @','$(ECHO)  Target Loaders........ $(TARGET_LOADERS)'#010+
   '        @$(ECHO)  Target Units.......... $(TARGET_UNITS)'#010+
   '        @$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
   '        @$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)'#010+
-  '       ',' @$(ECHO)  Target Dirs........... $(TARGET_DIRS)'#010+
+  '        ','@$(ECHO)  Target Dirs........... $(TARGET_DIRS)'#010+
   '        @$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)'#010+
   '        @$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Clean Units......... $(CLEAN_UNIT','S)'#010+
+  '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS',')'#010+
   '        @$(ECHO)  Clean Files......... $(CLEAN_FILES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Install Units....... $(INSTALL_UNITS)'#010+
   '        @$(ECHO)  Install Files....... $(INSTALL_FILES)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  == Install info =='#010,
-  '        @$(ECHO)'#010+
+  '        @$(ECHO)  == Install info =='#010+
+  ' ','       @$(ECHO)'#010+
   '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
   '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#010+
   '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#010+
   '        @$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
-  '        @$','(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
+  '        @$(','ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
   '        @$(ECHO)  FullZipName.......... $(FULLZIPNAME)'#010+
   '        @$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)'#010+
-  '    ','    @$(ECHO)  Install binary dir... $(INSTALL_BINDIR)'#010+
+  '     ','   @$(ECHO)  Install binary dir... $(INSTALL_BINDIR)'#010+
   '        @$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)'#010+
   '        @$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)'#010+
   '        @$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)'#010+
-  '        ','@$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)'#010+
+  '        @','$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)'#010+
   '        @$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
   '        @$(ECHO)  Install data dir..... $(INSTALL_DATADIR)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Dist destination dir. $(DIST_DESTD','IR)'#010+
+  '        @$(ECHO)  Dist destination dir. $(DIST_DESTDI','R)'#010+
   '        @$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)'#010+
   '        @$(ECHO)'#010+
   #010+
   '[inforules]'#010+
   '#####################################################################'#010+
   '# Info rules'#010+
-  '###################################################################','#'+
-  '#'#010+
+  '####################################################################','#'+
+  #010+
   #010+
   '.PHONY: fpc_info'#010+
   #010+
@@ -2165,7 +2165,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '# Rebuild Makefile'#010+
   '#####################################################################'#010+
   #010+
-  '.PHONY: fpc_makefi','le fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+
+  '.PHONY: fpc_makefil','e fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+
   'b2 \'#010+
   '        fpc_makefile_dirs'#010+
   #010+
@@ -2174,7 +2174,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   'fpc_makefile_sub1:'#010+
   'ifdef TARGET_DIRS'#010+
-  '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefi','le.fpc,$(TAR'+
+  '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefil','e.fpc,$(TAR'+
   'GET_DIRS))'#010+
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
@@ -2185,14 +2185,14 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
   'EXAMPLEDIRS))'#010+
   #010+
-  'fpc_make','file_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
+  'fpc_makef','ile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
   #010+
   'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
   #010+
   '[localmakefile]'#010+
   '#####################################################################'#010+
   '# Local Makefile'#010+
-  '##########################################','##########################'+
+  '###########################################','#########################'+
   '#'#010+
   #010+
   'ifneq ($(wildcard fpcmake.loc),)'#010+
@@ -2203,7 +2203,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '[userrules]'#010+
   '#####################################################################'#010+
   '# Users rules'#010+
-  '######################################################','##############'+
+  '#######################################################','#############'+
   '#'#010+
   #010+
   '[lclrules]'#010+
@@ -2213,7 +2213,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   #010+
   '# LCL Platform'#010+
   'ifndef LCL_PLATFORM'#010+
-  'ifeq ($(OS_TARGET),win32',')'#010+
+  'ifeq ($(OS_TARGET),win32)',#010+
   'LCL_PLATFORM=win32'#010+
   'else'#010+
   'LCL_PLATFORM=gtk'#010+
@@ -2225,7 +2225,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ifdef LCLDIR'#010+
   'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
   'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
-  'override LCLDIR=','wrong'#010+
+  'override LCLDIR=w','rong'#010+
   'endif'#010+
   'else'#010+
   'override LCLDIR=wrong'#010+
@@ -2237,7 +2237,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
-  'endi','f'#010+
+  'endif',#010+
   #010+
   '# Check for development version'#010+
   'ifeq ($(LCLDIR),wrong)'#010+
@@ -2245,8 +2245,8 @@ const fpcmakeini : array[0..210,1..240] of char=(
   ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
   'ifeq ($(LCLDIR),)'#010+
   'override LCLDIR=wrong'#010+
-  'endif'#010,
   'endif'#010+
+  'e','ndif'#010+
   #010+
   '# Check for release version'#010+
   'ifeq ($(LCLDIR),wrong)'#010+
@@ -2254,7 +2254,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
   'ifeq ($(LCLDIR),)'#010+
   'override LCLDIR=wrong'#010+
-  'endi','f'#010+
+  'endif',#010+
   'endif'#010+
   #010+
   '# Generate dirs'#010+
@@ -2262,7 +2262,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   'IR)/units)'#010+
   'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
   'nts $(LCLDIR)/components)'#010+
-  'export LCLDIR LCLUNITDIR LCLCOMPONENTD','IR'#010+
+  'export LCLDIR LCLUNITDIR LCLCOMPONENTDI','R'#010+
   #010+
   '# Add LCL dirs to paths'#010+
   'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
@@ -2271,7 +2271,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '[lclinforules]'#010+
   '#####################################################################'#010+
   '# LCL Info rules'#010+
-  '###################','#################################################'+
+  '####################','################################################'+
   '#'#010+
   'override INFORULES+=lclinfo'#010+
   #010+
@@ -2281,7 +2281,7 @@ const fpcmakeini : array[0..210,1..240] of char=(
   '        @$(ECHO)  == LCL info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Platform............. $(LCL_PLATFORM)'#010+
-  '        @$(ECHO)  LCLDIR....','........... $(LCLDIR)'#010+
+  '        @$(ECHO)  LCLDIR.....','.......... $(LCLDIR)'#010+
   '        @$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)'#010+
   '        @$(ECHO)  LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
   '        @$(ECHO)'#010

utils/fpcm/fpcmake.ini

@@ -1287,7 +1287,7 @@ ifeq ($(CPU_TARGET),i386)
 FPCCPUOPT:=-OG2p3
 else
 ifeq ($(CPU_TARGET),powerpc)
-FPCCPUOPT:=-O1r
+FPCCPUOPT:=-O2
 else
 FPCCPUOPT:=
 endif