From 19ff0fe9e5494859e6554faac00ec4509066b50a Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Fri, 4 Mar 2022 22:36:22 +0100
Subject: [PATCH] * patch from Debian packages by Paul Gevers, fixes spelling
---
utils/fpcm/fpcmake.inc | 520 ++++++++++++++++++++---------------------
utils/fpcm/fpcmake.ini | 2 +-
2 files changed, 261 insertions(+), 261 deletions(-)
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index 10baf17b2b..269ba4cef8 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -117,20 +117,20 @@ const fpcmakeini : array[0..260,1..240] of char=(
'PATHSEP=/'#010+
'else'#010+
'PATHSEP:=$(subst /,\,/)'#010+
- '# cygwin bash or sh can not handle backslashs'#010+
+ '# cygwin bash or sh can not handle backslashes'#010+
'ifdef inCygWin'#010+
'PATHSEP=/'#010+
'endif'#010+
'endif'#010+
- #010+
- '#',' Base dir'#010+
+ #010,
+ '# Base dir'#010+
'ifdef PWD'#010+
'BASEDIR:=$(subst \,/,$(shell $(PWD)))'#010+
'# For Cygwin we need to replace /cygdrive/c/ with c:/'#010+
'ifdef inCygWin'#010+
'ifneq ($(findstring /cygdrive/,$(BASEDIR)),)'#010+
'BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))'#010+
- 'BASEDRIVE:=$(firstwor','d $(subst /, ,$(BASENODIR)))'#010+
+ 'BASEDRIVE:=$(firstwo','rd $(subst /, ,$(BASENODIR)))'#010+
'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))'#010+
'endif'#010+
'endif'#010+
@@ -142,7 +142,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ays found'#010+
'ifdef inOS2'#010+
'ifndef ECHO'#010+
- 'ECHO:=$(s','trip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH'+
+ 'ECHO:=$(','strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH'+
'))))'#010+
'ifeq ($(ECHO),)'#010+
'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))'+
@@ -153,7 +153,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ECHO:=$(firstword $(ECHO))'#010+
'endif'#010+
'else'#010+
- 'ECHO:=$(firstword $','(ECHO))'#010+
+ 'ECHO:=$(firstword ','$(ECHO))'#010+
'endif'#010+
'endif'#010+
'export ECHO'#010+
@@ -164,7 +164,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# FPC Binary and Version Detection'#010+
'#####################################################################'#010+
#010+
- '# Compatibili','ty with old makefiles'#010+
+ '# Compatibil','ity with old makefiles'#010+
'ifndef FPC'#010+
'ifdef PP'#010+
'FPC=$(PP)'#010+
@@ -173,7 +173,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Try to detect the ppcXXX file to use by using "fpc -PB" option'#010+
'# to query for the default ppcXXX the fpc executable tries. When'#010+
- '# fpc is not found use ppc386 by default. Als','o when fpc -PB gives'#010+
+ '# fpc is not found use ppc386 by default. Al','so when fpc -PB gives'#010+
'# an error ppc386 will be used.'#010+
'ifndef FPC'#010+
'# check if fpc exists'#010+
@@ -182,14 +182,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifneq ($(FPCPROG),)'#010+
'FPCPROG:=$(firstword $(FPCPROG))'#010+
'ifneq ($(CPU_TARGET),)'#010+
- 'FPC:','=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)'#010+
+ 'FPC',':=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)'#010+
'else'#010+
'FPC:=$(shell $(FPCPROG) -PB)'#010+
'endif'#010+
'# Older fpc executables didn'#039't support it and return'#010+
'# Error: Illegal processor... If found then fallback to ppc386'#010+
'ifneq ($(findstring Error,$(FPC)),)'#010+
- 'overrid','e FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRC'+
+ 'overri','de FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRC'+
'EXEEXT),$(SEARCHPATH)))))'#010+
'else'#010+
'# if the cross compiler is not found, fall back to fpc'#010+
@@ -198,7 +198,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
'endif'#010+
'else'#010+
- '# fpc binar','y not found, fallback to ppc386'#010+
+ '# fpc bina','ry not found, fallback to ppc386'#010+
'override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEX'+
'EEXT),$(SEARCHPATH)))))'#010+
'endif'#010+
@@ -206,14 +206,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Get a clean executable name'#010+
'override FPC:=$(subst $(SRCEXEEXT),,$(FPC))'#010+
- 'override FPC:=$(subst \,/,$','(FPC))$(SRCEXEEXT)'#010+
+ 'override FPC:=$(subst \,/,','$(FPC))$(SRCEXEEXT)'#010+
#010+
'# Try to find the binary direct first, otherwise in the path,'#010+
'# if not found give an error'#010+
'FOUNDFPC:=$(strip $(wildcard $(FPC)))'#010+
'ifeq ($(FOUNDFPC),)'#010+
'FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))'#010+
- 'ifeq (','$(FOUNDFPC),)'#010+
+ 'ifeq ','($(FOUNDFPC),)'#010+
'$(error Compiler $(FPC) not found)'#010+
'endif'#010+
'endif'#010+
@@ -224,7 +224,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#010+
'endif'#010+
#010+
- '# FPC version',#010+
+ '# FPC versio','n'#010+
'ifndef FPC_VERSION'#010+
'FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))'#010+
'endif'#010+
@@ -234,7 +234,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# This should limit multiple checks'#010+
'unexport CHECKDEPEND ALLDEPENDENCIES'#010+
#010+
- '###################','#################################################'+
+ '##################','##################################################'+
'#'#010+
'# FPC Target Detection'#010+
'#####################################################################'#010+
@@ -242,7 +242,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Fall back to default values if needed'#010+
'ifndef CPU_TARGET'#010+
'ifdef CPU_TARGET_DEFAULT'#010+
- 'CPU_TARGET=$','(CPU_TARGET_DEFAULT)'#010+
+ 'CPU_TARGET=','$(CPU_TARGET_DEFAULT)'#010+
'endif'#010+
'endif'#010+
'ifndef OS_TARGET'#010+
@@ -255,7 +255,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifndef CPU_SOURCE'#010+
'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#010+
'endif'#010+
- 'ifndef',' CPU_TARGET'#010+
+ 'ifnde','f CPU_TARGET'#010+
'CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))'#010+
'endif'#010+
'ifndef OS_SOURCE'#010+
@@ -265,7 +265,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))'#010+
'endif'#010+
'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
- 'FULL_SOURCE=$','(CPU_SOURCE)-$(OS_SOURCE)'#010+
+ 'FULL_SOURCE=','$(CPU_SOURCE)-$(OS_SOURCE)'#010+
#010+
'ifeq ($(CPU_TARGET),armeb)'#010+
'ARCH=arm'#010+
@@ -280,7 +280,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'ifeq ($(FULL_TARGET),aarch64-embedded)'#010+
- '# override FPC','OPT+=-Cp$(SUBARCH)'#010+
+ '# override FP','COPT+=-Cp$(SUBARCH)'#010+
'endif'#010+
#010+
'ifeq ($(FULL_TARGET),arm-embedded)'#010+
@@ -288,7 +288,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# we don'#039't add a default here, people should explicitly add the SU'+
'BARCH'#010+
'$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBA'+
- 'RCH=armv4t or SUBA','RCH=armv7m) must be defined)'#010+
+ 'RCH=armv4t or SUB','ARCH=armv7m) must be defined)'#010+
'endif'#010+
'override FPCOPT+=-Cp$(SUBARCH)'#010+
'endif'#010+
@@ -297,7 +297,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(SUBARCH),)'#010+
'# we don'#039't add a default here, people should explicitly add the SU'+
'BARCH'#010+
- '$(error When compiling for avr-embedded, ','a sub-architecture (e.g. SU'+
+ '$(error When compiling for avr-embedded,',' a sub-architecture (e.g. SU'+
'BARCH=avr25 or SUBARCH=avr35) must be defined)'#010+
'endif'#010+
'override FPCOPT+=-Cp$(SUBARCH)'#010+
@@ -305,7 +305,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'ifeq ($(FULL_TARGET),mipsel-embedded)'#010+
'ifeq ($(SUBARCH),)'#010+
- '# we don'#039't add a default here, people should explicitly add the S',
+ '# we don'#039't add a default here, people should explicitly add the ','S'+
'UBARCH'#010+
'$(error When compiling for mipsel-embedded, a sub-architecture (e.g. S'+
'UBARCH=pic32mx) must be defined)'#010+
@@ -315,7 +315,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'ifeq ($(FULL_TARGET),xtensa-embedded)'#010+
'ifeq ($(SUBARCH),)'#010+
- '$(error When compiling for xt','ensa-embedded, a sub-architecture (e.g.'+
+ '$(error When compiling for x','tensa-embedded, a sub-architecture (e.g.'+
' SUBARCH=lx106 or SUBARCH=lx6) must be defined)'#010+
'endif'#010+
'override FPCOPT+=-Cp$(SUBARCH)'#010+
@@ -323,7 +323,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'ifeq ($(FULL_TARGET),xtensa-freertos)'#010+
'ifeq ($(SUBARCH),)'#010+
- '$(error When compiling for xtensa-freertos, a sub-ar','chitecture (e.g.'+
+ '$(error When compiling for xtensa-freertos, a sub-a','rchitecture (e.g.'+
' SUBARCH=lx106 or SUBARCH=lx6) must be defined)'#010+
'endif'#010+
'override FPCOPT+=-Cp$(SUBARCH)'#010+
@@ -332,7 +332,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(FULL_TARGET),arm-freertos)'#010+
'ifeq ($(SUBARCH),)'#010+
'$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBA'+
- 'RCH=armv','6m or SUBARCH=armv7em) must be defined)'#010+
+ 'RCH=arm','v6m or SUBARCH=armv7em) must be defined)'#010+
'endif'#010+
'override FPCOPT+=-Cp$(SUBARCH)'#010+
'endif'#010+
@@ -340,7 +340,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Full name of the target, including CPU and OS. For OSs limited'#010+
'# to 8.3 we only use the target OS'#010+
'ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)'#010+
- 'TARGETSUFFI','X=$(OS_TARGET)'#010+
+ 'TARGETSUFF','IX=$(OS_TARGET)'#010+
'SOURCESUFFIX=$(OS_SOURCE)'#010+
'else'#010+
'ifneq ($(filter $(OS_TARGET),$(LIMIT83fs)),)'#010+
@@ -352,7 +352,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'# Cross compile flag'#010+
- 'ifneq ($(FULL_TARGET),$(FULL','_SOURCE))'#010+
+ 'ifneq ($(FULL_TARGET),$(FUL','L_SOURCE))'#010+
'CROSSCOMPILE=1'#010+
'endif'#010+
#010+
@@ -360,7 +360,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# when the make target is to rebuild the makefile'#010+
'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+
'ifeq ($(filter $(FULL_TARGET),$(MAKEFILETARGETS)),)'#010+
- '$(err','or The Makefile doesn'#039't support target $(FULL_TARGET), plea'+
+ '$(er','ror The Makefile doesn'#039't support target $(FULL_TARGET), plea'+
'se run fpcmake first)'#010+
'endif'#010+
'endif'#010+
@@ -372,7 +372,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'BSDhier=1'#010+
'endif'#010+
#010+
- '# Detect Linux, w','ill also use its own directory hierarchy.'#010+
+ '# Detect Linux, ','will also use its own directory hierarchy.'#010+
'ifeq ($(OS_TARGET),linux)'#010+
'linuxHier=1'#010+
'endif'#010+
@@ -387,13 +387,13 @@ const fpcmakeini : array[0..260,1..240] of char=(
'export BUILDNATIVE'#010+
'endif'#010+
#010+
- 'export OS_TARGET OS_SOU','RCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FU'+
+ 'export OS_TARGET OS_SO','URCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FU'+
'LL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+
#010+
'[fpmakefpcdetect]'#010+
'#####################################################################'#010+
'# FPC Binary and Version Detection'#010+
- '######################','##############################################'+
+ '#####################','###############################################'+
'#'#010+
'# If FPCFPMAKE is not set and we'#039're cross-compiling, try to find a'+
#010+
@@ -401,7 +401,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifndef FPCFPMAKE'#010+
#010+
'ifdef CROSSCOMPILE'#010+
- '# Search for the (native) ppc compiler which is used to do the latest',
+ '# Search for the (native) ppc compiler which is used to do the lates','t'+
' build'#010+
'# of the native rtl'#010+
#010+
@@ -409,7 +409,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'R)))),)'#010+
'# If that compiler is not found, use the common, installed native comp'+
'iler'#010+
- '# Note that in this case FPCFPMAKE is not exported, because',' it could'+
+ '# Note that in this case FPCFPMAKE is not exported, becaus','e it could'+
' be that'#010+
'# a more suitable compiler is compiled later on'#010+
'# check if fpc exists'#010+
@@ -417,21 +417,21 @@ const fpcmakeini : array[0..260,1..240] of char=(
')))'#010+
'ifneq ($(FPCPROG),)'#010+
'FPCPROG:=$(firstword $(FPCPROG))'#010+
- 'FPCFPMAKE:=$(shell $(FPCP','ROG) -PB)'#010+
+ 'FPCFPMAKE:=$(shell $(FPC','PROG) -PB)'#010+
'# if a native compiler is not found, fall back to fpc'#010+
'ifeq ($(strip $(wildcard $(FPCFPMAKE))),)'#010+
'FPCFPMAKE:=$(firstword $(FPCPROG))'#010+
'endif'#010+
'else'#010+
'# fpc binary not found, fallback to ppc386'#010+
- 'override FPCFPMAKE=$(firstword $(strip $(wild','card $(addsuffix /ppc38'+
+ 'override FPCFPMAKE=$(firstword $(strip $(wil','dcard $(addsuffix /ppc38'+
'6$(SRCEXEEXT),$(SEARCHPATH)))))'#010+
'endif'#010+
'else'#010+
'# Use the ppc compiler. Because the path to the compiler is relative, '+
'do not'#010+
'# evaluate the variable here, but do that on the fly.'#010+
- 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /c','ompiler/ppc$(SRCEXEEXT),$'+
+ 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /','compiler/ppc$(SRCEXEEXT),$'+
'(FPCDIR))))'#010+
'FPMAKE_SKIP_CONFIG=-n'#010+
'export FPCFPMAKE'#010+
@@ -447,7 +447,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[fpcdircheckenv]'#010+
- '#######################################################','#############'+
+ '######################################################','##############'+
'#'#010+
'# FPCDIR Setting'#010+
'#####################################################################'#010+
@@ -455,7 +455,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Test FPCDIR to look if the RTL dir exists'#010+
'ifdef FPCDIR'#010+
'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+
- 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,','rtl)),)'#010+
+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/',',rtl)),)'#010+
'override FPCDIR=wrong'#010+
'endif'#010+
'else'#010+
@@ -466,7 +466,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef DEFAULT_FPCDIR'#010+
'ifeq ($(FPCDIR),wrong)'#010+
'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+
- 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl',')),)'#010+
+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rt','l)),)'#010+
'override FPCDIR=wrong'#010+
'endif'#010+
'endif'#010+
@@ -478,7 +478,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef inUnix'#010+
'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+
'ifeq ($(wildcard $(FPCDIR)/units),)'#010+
- 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSIO','N)'#010+
+ 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSI','ON)'#010+
'endif'#010+
'else'#010+
'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+
@@ -486,7 +486,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'override FPCDIR:=$(FPCDIR)/..'#010+
'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+
'override FPCDIR:=$(FPCDIR)/..'#010+
- 'ifeq ($(wildca','rd $(addprefix $(FPCDIR)/,rtl)),)'#010+
+ 'ifeq ($(wildc','ard $(addprefix $(FPCDIR)/,rtl)),)'#010+
'override FPCDIR:=$(BASEDIR)'#010+
'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+
'override FPCDIR=c:/pp'#010+
@@ -498,7 +498,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Cross binaries dir'#010+
'ifndef CROSSBINDIR'#010+
- 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin','/$(TARGETSUFFIX))'#010+
+ 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bi','n/$(TARGETSUFFIX))'#010+
'endif'#010+
#010+
'# Default binutils prefix for cross compile when the'#010+
@@ -506,7 +506,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifneq ($(filter $(OS_TARGET),darwin iphonesim ios),)'#010+
'ifneq ($(filter $(OS_SOURCE),darwin ios),)'#010+
'DARWIN2DARWIN=1'#010+
- 'endif',#010+
+ 'endi','f'#010+
'endif'#010+
#010+
'ifndef BINUTILSPREFIX'#010+
@@ -518,7 +518,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+
#010+
'# For Android use standard NDK prefixes'#010+
- 'ifeq ($(OS_TAR','GET),android)'#010+
+ 'ifeq ($(OS_TA','RGET),android)'#010+
'ifeq ($(CPU_TARGET),arm)'#010+
'BINUTILSPREFIX=arm-linux-androideabi-'#010+
'else'#010+
@@ -533,7 +533,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
'endif'#010+
'else'#010+
- 'BINUTILSPREF','IX=$(OS_TARGET)-'#010+
+ 'BINUTILSPRE','FIX=$(OS_TARGET)-'#010+
'endif'#010+
'endif'#010+
'endif'#010+
@@ -543,7 +543,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# the OS for backwards compatibility'#010+
'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+
'ifeq ($(UNITSDIR),)'#010+
- 'UNITSDIR:=$(wildcard $(FPCDIR)/uni','ts/$(OS_TARGET))'#010+
+ 'UNITSDIR:=$(wildcard $(FPCDIR)/un','its/$(OS_TARGET))'#010+
'endif'#010+
#010+
'# Packages dir'#010+
@@ -553,7 +553,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'[shelltools]'#010+
'#####################################################################'#010+
'# Shell tools'#010+
- '################################################','####################'+
+ '###############################################','#####################'+
'#'#010+
#010+
'# Echo that can redir (must be able run in the default OS shell)'#010+
@@ -570,7 +570,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'COPY:=$(CPPROG) -fp'#010+
'endif'#010+
#010+
- '# Copy a whol','e tree'#010+
+ '# Copy a who','le tree'#010+
'ifndef COPYTREE'#010+
'COPYTREE:=$(CPPROG) -Rfp'#010+
'endif'#010+
@@ -588,7 +588,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Check delete program'#010+
'ifndef DEL'#010+
'DEL:=$(RMPROG) -f'#010+
- 'endif'#010,
+ 'endif',#010+
#010+
'# Check deltree program'#010+
'ifndef DELTREE'#010+
@@ -607,7 +607,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# To install programs'#010+
'ifndef INSTALLEXE'#010+
'ifdef inUnix'#010+
- 'INST','ALLEXE:=$(GINSTALL) -c -m 755'#010+
+ 'INS','TALLEXE:=$(GINSTALL) -c -m 755'#010+
'else'#010+
'INSTALLEXE:=$(COPY)'#010+
'endif'#010+
@@ -623,7 +623,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[defaultdirs]'#010+
- '###########','#########################################################'+
+ '##########','##########################################################'+
'#'#010+
'# Default Directories'#010+
'#####################################################################'#010+
@@ -633,7 +633,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+
'endif'#010+
#010+
- '# Units',' dir'#010+
+ '# Unit','s dir'#010+
'ifdef REQUIRE_PACKAGESDIR'#010+
'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+
'endif'#010+
@@ -642,7 +642,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Unixes use unix dirs with /usr/bin, /usr/lib'#010+
'# When zipping use the target os default, when normal install then'#010+
'# use the source os as default'#010+
- 'ifdef ZIPIN','STALL'#010+
+ 'ifdef ZIPI','NSTALL'#010+
'# Zipinstall'#010+
'ifneq ($(filter $(OS_TARGET),$(UNIXs)),)'#010+
'UNIXHier=1'#010+
@@ -656,7 +656,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# When install prefix is not set try to use prefix'#010+
'ifndef INSTALL_PREFIX'#010+
- 'ifd','ef PREFIX'#010+
+ 'if','def PREFIX'#010+
'INSTALL_PREFIX=$(PREFIX)'#010+
'endif'#010+
'endif'#010+
@@ -669,7 +669,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef INSTALL_FPCPACKAGE'#010+
'INSTALL_BASEDIR:=/pp'#010+
'else'#010+
- 'INSTALL_BASEDIR:=/','$(PACKAGE_NAME)'#010+
+ 'INSTALL_BASEDIR:=','/$(PACKAGE_NAME)'#010+
'endif'#010+
'endif'#010+
'endif'#010+
@@ -681,7 +681,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'export INSTALL_FPCSUBDIR'#010+
'endif'#010+
#010+
- '# Where to place the resulting zip file','s'#010+
+ '# Where to place the resulting zip fil','es'#010+
'ifndef DIST_DESTDIR'#010+
'DIST_DESTDIR:=$(BASEDIR)'#010+
'endif'#010+
@@ -692,7 +692,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef PACKAGEDIR_MAIN'#010+
'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+
'else'#010+
- 'COMPILER_UNITTAR','GETDIR=units/$(TARGETSUFFIX)'#010+
+ 'COMPILER_UNITTA','RGETDIR=units/$(TARGETSUFFIX)'#010+
'endif'#010+
'endif'#010+
'ifndef COMPILER_TARGETDIR'#010+
@@ -702,7 +702,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'#####################################################################'#010+
'# Install Directories'#010+
- '####################################################','################'+
+ '###################################################','#################'+
'#'#010+
#010+
'# set the base directory where to install everything'#010+
@@ -711,7 +711,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef INSTALL_FPCPACKAGE'#010+
'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+
'else'#010+
- 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(P','ACKAGE_NAME)'#010+
+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(','PACKAGE_NAME)'#010+
'endif'#010+
'else'#010+
'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+
@@ -723,7 +723,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef UNIXHier'#010+
'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+
'else'#010+
- 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin',#010+
+ 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bi','n'#010+
'# for FPC packages install the binaries under their target subdir'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
'ifdef CROSSCOMPILE'#010+
@@ -731,7 +731,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+
'else'#010+
'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+
- 'endif',#010+
+ 'endi','f'#010+
'else'#010+
'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+
'endif'#010+
@@ -743,7 +743,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifndef INSTALL_UNITDIR'#010+
'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
- 'ifdef',' PACKAGE_NAME'#010+
+ 'ifde','f PACKAGE_NAME'#010+
'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
'endif'#010+
'endif'#010+
@@ -755,7 +755,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+
'else'#010+
'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+
- 'endi','f'#010+
+ 'end','if'#010+
'endif'#010+
#010+
'# Where the source files will be stored'#010+
@@ -771,7 +771,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
'endif'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
- 'ifdef INSTA','LL_FPCSUBDIR'#010+
+ 'ifdef INST','ALL_FPCSUBDIR'#010+
'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+
')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+
'else'#010+
@@ -779,7 +779,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
')/$(PACKAGE_NAME)'#010+
'endif'#010+
'else'#010+
- 'INSTALL_SOURCE','DIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+
+ 'INSTALL_SOURC','EDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+
'-$(PACKAGE_VERSION)'#010+
'endif'#010+
'else'#010+
@@ -788,7 +788,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+
'CKAGE_NAME)'#010+
'else'#010+
- 'INSTALL_SOURCEDIR:=','$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+
+ 'INSTALL_SOURCEDIR:','=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+
'endif'#010+
'else'#010+
'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+
@@ -802,7 +802,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef BSDhier'#010+
'DOCPREFIXDIR=share/doc'#010+
'else'#010+
- 'ifdef l','inuxHier'#010+
+ 'ifdef ','linuxHier'#010+
'DOCPREFIXDIR=share/doc'#010+
'else'#010+
'DOCPREFIXDIR=doc'#010+
@@ -812,7 +812,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+
'(PACKAGE_NAME)'#010+
'else'#010+
- 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE','_NAME)-$('+
+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAG','E_NAME)-$('+
'PACKAGE_VERSION)'#010+
'endif'#010+
'else'#010+
@@ -824,7 +824,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- '# Where to install the examples, under linux we use the doc ','dir'#010+
+ '# Where to install the examples, under linux we use the doc',' dir'#010+
'# because the copytree command will create a subdir itself'#010+
'ifndef INSTALL_EXAMPLEDIR'#010+
'ifdef UNIXHier'#010+
@@ -834,7 +834,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+
')/$(PACKAGE_NAME)'#010+
'else'#010+
- 'ifd','ef linuxHier'#010+
+ 'if','def linuxHier'#010+
'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+
'else'#010+
'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+
@@ -845,7 +845,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'else'#010+
#010+
'ifdef BSDhier'#010+
- 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(P','ACKAGE_NAME)'+
+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(','PACKAGE_NAME)'+
'-$(PACKAGE_VERSION)'#010+
'else'#010+
'ifdef linuxHier'#010+
@@ -858,7 +858,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'endif'#010+
'endif'#010+
- 'else',#010+
+ 'els','e'#010+
'ifdef INSTALL_FPCPACKAGE'#010+
'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+
'else'#010+
@@ -869,7 +869,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Where the some extra (data)files will be stored'#010+
'ifndef INSTALL_DATADIR'#010+
- 'INSTA','LL_DATADIR=$(INSTALL_BASEDIR)'#010+
+ 'INST','ALL_DATADIR=$(INSTALL_BASEDIR)'#010+
'endif'#010+
#010+
'ifndef INSTALL_SHAREDDIR'#010+
@@ -878,14 +878,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'#####################################################################'#010+
'# Cross compile dirs'#010+
- '########################################','############################'+
+ '#######################################','#############################'+
'#'#010+
#010+
'ifdef CROSSCOMPILE'#010+
'# Directory where the cross compile tools are stored.'#010+
'# First check if they are available in FPCDIR. If no targets/ subdir'#010+
'# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+
- 'ifndef CROSS','BINDIR'#010+
+ 'ifndef CROS','SBINDIR'#010+
'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+
'ifeq ($(CROSSBINDIR),)'#010+
'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+
@@ -898,7 +898,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[dirlibc]'#010+
- '# On linux, tr','y to find where libgcc.a is.'#010+
+ '# On linux, t','ry to find where libgcc.a is.'#010+
'ifeq ($(OS_SOURCE),linux)'#010+
#010+
'# Amd64 to i386?'#010+
@@ -906,7 +906,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(CPU_TARGET),i386)'#010+
'ifneq ($(filter x86_64,$(shell uname -a)),)'#010+
'ifeq ($(BINUTILSPREFIX),)'#010+
- 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-fil','e-name`)'#010+
+ 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-fi','le-name`)'#010+
'else'#010+
'CROSSGCCOPT=-m32'#010+
'endif'#010+
@@ -920,7 +920,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
'endif'#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+
@@ -929,14 +929,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(CPU_TARGET),sparc)'#010+
'ifneq ($(filter sparc64,$(shell uname -a)),)'#010+
'ifeq ($(BINUTILSPREFIX),)'#010+
- 'GCCLIBDIR:=$(shell dirname ','`gcc -m32 -print-libgcc-file-name`)'#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+
- 'CROSSGCC','OPT=-mabi=64'#010+
+ 'CROSSGC','COPT=-mabi=64'#010+
'endif'#010+
'else'#010+
'# gcc mips seems not to recognize -m32/-m64'#010+
@@ -946,7 +946,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'else'#010+
'CROSSGCCOPT=-mabi=32'#010+
'endif'#010+
- 'el','se'#010+
+ 'e','lse'#010+
'ifeq ($(BINUTILSPREFIX),)'#010+
'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+
'else'#010+
@@ -961,13 +961,13 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Check if FPCFPMAKE compiler is same target as FPC'#010+
'ifdef FPCFPMAKE'#010+
- 'FPCFPMAKE_CPU_T','ARGET=$(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+
'FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)'#010+
'else'#010+
- 'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 spar',
- 'c64 x86_64),)'#010+
+ 'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 spa',
+ 'rc64 x86_64),)'#010+
'FPCMAKE_CROSSGCCOPT=-m64'#010+
'else'#010+
'ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)'#010+
@@ -976,7 +976,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)'#010+
'FPCMAKE_CROSSGCCOPT=-mabi=32'#010+
'else'#010+
- 'ifeq ($(FPCFPMAKE_CP','U_OPT),riscv64)'#010+
+ 'ifeq ($(FPCFPMAKE_C','PU_OPT),riscv64)'#010+
'FPCMAKE_CROSSGCCOPT=-mabi=lp64'#010+
'else'#010+
'ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)'#010+
@@ -988,7 +988,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
'endif'#010+
'endif'#010+
- 'FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT',') -print'+
+ 'FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOP','T) -print'+
'-libgcc-file-name`)'#010+
'endif'#010+
'endif'#010+
@@ -999,8 +999,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Try cross gcc'#010+
'ifndef GCCLIBDIR'#010+
- 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE',
- 'XT),$(SEARCHPATH))))'#010+
+ 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXE',
+ 'EXT),$(SEARCHPATH))))'#010+
'ifneq ($(CROSSGCC),)'#010+
'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-f'+
'ile-name`)'#010+
@@ -1012,7 +1012,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef inUnix'#010+
'ifeq ($(OS_SOURCE),netbsd)'#010+
'OTHERLIBDIR:=/usr/pkg/lib'#010+
- 'endif'#010,
+ 'endif',#010+
'export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR'#010+
'endif'#010+
#010+
@@ -1022,7 +1022,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Default extensions'#010+
'#####################################################################'#010+
#010+
- '# Default n','eeded extensions (Go32v2,Linux)'#010+
+ '# Default ','needed extensions (Go32v2,Linux)'#010+
'BATCHEXT=.bat'#010+
'LOADEREXT=.as'#010+
'EXEEXT=.exe'#010+
@@ -1037,7 +1037,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'SHAREDLIBPREFIX=libfp'#010+
'STATICLIBPREFIX=libp'#010+
'IMPORTLIBPREFIX=libimp'#010+
- 'RST','EXT=.rst'#010+
+ 'RS','TEXT=.rst'#010+
'# external debug info for executable'#010+
'EXEDBGEXT=.dbg'#010+
'#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+
@@ -1050,7 +1050,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'# Go32v2'#010+
- 'ifeq ($(OS_TAR','GET),go32v2)'#010+
+ 'ifeq ($(OS_TA','RGET),go32v2)'#010+
'STATICLIBPREFIX='#010+
'SHORTSUFFIX=dos'#010+
'IMPORTLIBPREFIX='#010+
@@ -1067,7 +1067,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#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+
@@ -1086,7 +1086,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# DragonFly BSD'#010+
'ifeq ($(OS_TARGET),dragonfly)'#010+
- 'BA','TCHEXT=.sh'#010+
+ 'B','ATCHEXT=.sh'#010+
'EXEEXT='#010+
'HASSHAREDLIB=1'#010+
'SHORTSUFFIX=df'#010+
@@ -1105,7 +1105,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'BATCHEXT=.sh'#010+
'EXEEXT='#010+
'HASSHAREDLIB=1'#010+
- 'SHORTSUFFIX=nbs',#010+
+ 'SHORTSUFFIX=nb','s'#010+
'endif'#010+
#010+
'# OpenBSD'#010+
@@ -1126,7 +1126,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(OS_TARGET),os2)'#010+
'BATCHEXT=.cmd'#010+
'AOUTEXT=.out'#010+
- 'ST','ATICLIBPREFIX='#010+
+ 'S','TATICLIBPREFIX='#010+
'SHAREDLIBEXT=.dll'#010+
'SHORTSUFFIX=os2'#010+
'ECHO=echo'#010+
@@ -1145,7 +1145,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'# Amiga'#010+
- 'ifeq ($','(OS_TARGET),amiga)'#010+
+ 'ifeq (','$(OS_TARGET),amiga)'#010+
'EXEEXT='#010+
'SHAREDLIBEXT=.library'#010+
'SHORTSUFFIX=amg'#010+
@@ -1162,7 +1162,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(OS_TARGET),morphos)'#010+
'EXEEXT='#010+
'SHAREDLIBEXT=.library'#010+
- 'SHORTSUFFIX=mo','s'#010+
+ 'SHORTSUFFIX=m','os'#010+
'endif'#010+
#010+
'# Atari'#010+
@@ -1185,7 +1185,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'SHORTSUFFIX=hai'#010+
'endif'#010+
#010+
- '# Solaris',#010+
+ '# Solari','s'#010+
'ifeq ($(OS_TARGET),solaris)'#010+
'BATCHEXT=.sh'#010+
'EXEEXT='#010+
@@ -1204,7 +1204,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'EXEEXT=.nlm'#010+
'STATICLIBPREFIX='#010+
'SHORTSUFFIX=nw'#010+
- 'IMPORT','LIBPREFIX=imp'#010+
+ 'IMPOR','TLIBPREFIX=imp'#010+
'endif'#010+
#010+
'# Netware libc'#010+
@@ -1220,7 +1220,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'BATCHEXT='#010+
'EXEEXT='#010+
'DEBUGSYMEXT=.xcoff'#010+
- 'SHORTSUFFIX=mac'#010,
+ 'SHORTSUFFIX=mac',#010+
'IMPORTLIBPREFIX=imp'#010+
'endif'#010+
#010+
@@ -1237,8 +1237,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(OS_TARGET),gba)'#010+
'EXEEXT=.gba'#010+
'SHAREDLIBEXT=.so'#010+
- 'SHORTSUFFIX=gba'#010+
- 'e','ndif'#010+
+ 'SHORTSUFFIX=gba'#010,
+ 'endif'#010+
#010+
'# Symbian OS'#010+
'ifeq ($(OS_TARGET),symbian)'#010+
@@ -1256,7 +1256,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(OS_TARGET),wii)'#010+
'EXEEXT=.dol'#010+
'SHAREDLIBEXT=.so'#010+
- 'SHO','RTSUFFIX=wii'#010+
+ 'SH','ORTSUFFIX=wii'#010+
'endif'#010+
#010+
'# AIX'#010+
@@ -1276,7 +1276,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'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+
@@ -1294,7 +1294,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# MSX-DOS'#010+
'ifeq ($(OS_TARGET),msxdos)'#010+
- 'STATI','CLIBPREFIX='#010+
+ 'STAT','ICLIBPREFIX='#010+
'STATICLIBEXT=.a'#010+
'SHORTSUFFIX=msd'#010+
'endif'#010+
@@ -1313,7 +1313,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'SHORTSUFFIX=emb'#010+
'endif'#010+
#010+
- '# ','Win16'#010+
+ '#',' Win16'#010+
'ifeq ($(OS_TARGET),win16)'#010+
'STATICLIBPREFIX='#010+
'STATICLIBEXT=.a'#010+
@@ -1332,7 +1332,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
#010+
- '# For 8.3 limited O','S'#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+
@@ -1341,7 +1341,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ZIPSOURCESUFFIX=src'#010+
'ZIPEXAMPLESUFFIX=exm'#010+
'else'#010+
- 'FPCMADE=f','pcmade.$(TARGETSUFFIX)'#010+
+ 'FPCMADE=','fpcmade.$(TARGETSUFFIX)'#010+
'ZIPSOURCESUFFIX=.source'#010+
'ZIPEXAMPLESUFFIX=.examples'#010+
'ifdef CROSSCOMPILE'#010+
@@ -1354,7 +1354,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'[defaulttools]'#010+
- '############','########################################################'+
+ '###########','#########################################################'+
'#'#010+
'# Default Tools'#010+
'#####################################################################'#010+
@@ -1362,7 +1362,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Names of the binutils tools'#010+
'ASNAME=$(BINUTILSPREFIX)as'#010+
'LDNAME=$(BINUTILSPREFIX)ld'#010+
- 'ARNAME=$(BI','NUTILSPREFIX)ar'#010+
+ 'ARNAME=$(B','INUTILSPREFIX)ar'#010+
'RCNAME=$(BINUTILSPREFIX)rc'#010+
'NASMNAME=$(BINUTILSPREFIX)nasm'#010+
#010+
@@ -1375,7 +1375,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'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+
@@ -1389,7 +1389,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef CROSSBINDIR'#010+
'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+
'else'#010+
- 'RCPROG','=$(RCNAME)'#010+
+ 'RCPRO','G=$(RCNAME)'#010+
'endif'#010+
'endif'#010+
#010+
@@ -1405,7 +1405,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# NASM assembler, redefine it if cross compiling'#010+
'ifndef NASMPROG'#010+
'ifdef CROSSBINDIR'#010+
- 'NASMPROG=$(','CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+
+ 'NASMPROG=$','(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+
'else'#010+
'NASMPROG=$(NASMNAME)'#010+
'endif'#010+
@@ -1422,7 +1422,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef inUnix'#010+
'PPAS=./ppas$(SRCBATCHEXT)'#010+
'else'#010+
- 'PPAS=ppas','$(SRCBATCHEXT)'#010+
+ 'PPAS=ppa','s$(SRCBATCHEXT)'#010+
'endif'#010+
#010+
'# ldconfig to rebuild .so cache'#010+
@@ -1443,7 +1443,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ZIPEXT=.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 +1455,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+
@@ -1466,7 +1466,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'# Load commandline OPT and add target and unit dir to be sure'#010+
- 'ifneq ($(O','S_TARGET),$(OS_SOURCE))'#010+
+ 'ifneq ($(','OS_TARGET),$(OS_SOURCE))'#010+
'override FPCOPT+=-T$(OS_TARGET)'#010+
'endif'#010+
#010+
@@ -1476,7 +1476,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'ifeq ($(OS_SOURCE),openbsd)'#010+
'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+
- 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS','_PATH)'#010+
+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTIL','S_PATH)'#010+
'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+
'endif'#010+
#010+
@@ -1489,14 +1489,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- '# When BINUTIL','SPREFIX is given and we are not cross-compiling then u'+
+ '# When BINUTI','LSPREFIX is given and we are not cross-compiling then u'+
'se'#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$(BINUTILS','PREFIX)'#010+
+ 'override FPCMAKEOPT+=-XP$(BINUTIL','SPREFIX)'#010+
'override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+
'endif'#010+
'endif'#010+
@@ -1506,7 +1506,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
'endif'#010+
'ifdef LIBDIR'#010+
- 'override FPCOPT+=$(addprefix -Fl,$(L','IBDIR))'#010+
+ 'override FPCOPT+=$(addprefix -Fl,$(','LIBDIR))'#010+
'endif'#010+
'ifdef OBJDIR'#010+
'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
@@ -1521,7 +1521,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'# Smartlinking creation'#010+
- 'ifdef CREATESMAR','T'#010+
+ 'ifdef CREATESMA','RT'#010+
'override FPCOPT+=-CX'#010+
'endif'#010+
#010+
@@ -1536,7 +1536,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef RELEASE'#010+
'FPCCPUOPT:=-O2'#010+
'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+
- 'override',' FPCOPTDEF+=RELEASE'#010+
+ 'overrid','e FPCOPTDEF+=RELEASE'#010+
'endif'#010+
#010+
'# Strip'#010+
@@ -1554,8 +1554,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
'override FPCOPT+=-vwni'#010+
'endif'#010+
#010+
- '# Needed compiler options'#010+
- 'i','fdef COMPILER_OPTIONS'#010+
+ '# Needed compiler options'#010,
+ 'ifdef COMPILER_OPTIONS'#010+
'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
'endif'#010+
'ifdef COMPILER_UNITDIR'#010+
@@ -1564,7 +1564,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef COMPILER_LIBRARYDIR'#010+
'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
'endif'#010+
- 'ifd','ef COMPILER_OBJECTDIR'#010+
+ 'if','def COMPILER_OBJECTDIR'#010+
'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
'endif'#010+
'ifdef COMPILER_INCLUDEDIR'#010+
@@ -1573,7 +1573,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Cross compiler utils'#010+
'ifdef CROSSBINDIR'#010+
- 'override FPCOPT+=-FD$(CRO','SSBINDIR)'#010+
+ 'override FPCOPT+=-FD$(CR','OSSBINDIR)'#010+
'endif'#010+
#010+
'# Target dirs and the prefix to use for clean/install'#010+
@@ -1582,7 +1582,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(COMPILER_TARGETDIR),.)'#010+
'override TARGETDIRPREFIX='#010+
'else'#010+
- 'override TARGETDIRPREFIX=$(COMPILER_TARG','ETDIR)/'#010+
+ 'override TARGETDIRPREFIX=$(COMPILER_TAR','GETDIR)/'#010+
'endif'#010+
'endif'#010+
#010+
@@ -1592,7 +1592,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
'override UNITTARGETDIRPREFIX='#010+
'else'#010+
- 'override UNITTARGETDIRPREF','IX=$(COMPILER_UNITTARGETDIR)/'#010+
+ 'override UNITTARGETDIRPRE','FIX=$(COMPILER_UNITTARGETDIR)/'#010+
'endif'#010+
'else'#010+
'ifdef COMPILER_TARGETDIR'#010+
@@ -1603,13 +1603,13 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'ifdef SYSROOTPATH'#010+
'override FPCOPT+=-XR$(SYSROOTPATH)'#010+
- 'else'#010+
- '#',' if we are compiling natively on aarch64-darwin and if -/Library/De'+
- 'veloper/CommandLineTools/SDKs/MacOSX.sdk exists,'#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 o','ne'#010+
+ '# so far the only tested ','one'#010+
'ifeq ($(CPU_TARGET),aarch64)'#010+
'ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk)'+
',)'#010+
@@ -1622,15 +1622,15 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'ifdef CREATESHARED'#010+
- 'override FPCO','PT+=-Cg'#010+
+ 'override FPC','OPT+=-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 ris','c'+
- 'v64 powerpc64),)'#010+
+ 'ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el ri','s'+
+ 'cv64 powerpc64),)'#010+
'override FPCOPT+=-Cg'#010+
'endif'#010+
'endif'#010+
@@ -1644,7 +1644,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Add GCC lib path if asked'#010+
'ifdef GCCLIBDIR'#010+
'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
- 'ifdef FPCMAKEGCCLIBDIR'#010,
+ 'ifdef FPCMAKEGCCLIBDIR',#010+
'override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)'#010+
'else'#010+
'override FPCMAKEOPT+=-Fl$(GCCLIBDIR)'#010+
@@ -1656,8 +1656,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[command_end]'#010+
- '# Add commandline options last so they can override'#010+
- 'i','fdef OPT'#010+
+ '# Add commandline options last so they can override'#010,
+ 'ifdef OPT'#010+
'override FPCOPT+=$(OPT)'#010+
'endif'#010+
#010+
@@ -1667,7 +1667,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+
'endif'#010+
#010+
- '# Add defines from FPCOPTD','EF to FPCOPT'#010+
+ '# Add defines from FPCOPT','DEF to FPCOPT'#010+
'ifdef FPCOPTDEF'#010+
'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
'endif'#010+
@@ -1679,7 +1679,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Use the environment to pass commandline options?'#010+
'ifdef USEENV'#010+
- 'override FPC','EXTCMD:=$(FPCOPT)'#010+
+ 'override FP','CEXTCMD:=$(FPCOPT)'#010+
'override FPCOPT:=!FPCEXTCMD'#010+
'export FPCEXTCMD'#010+
'endif'#010+
@@ -1689,7 +1689,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+
'override ACROSSCOMPILE=1'#010+
- 'endif'#010,
+ 'endif',#010+
#010+
'ifdef ACROSSCOMPILE'#010+
'override FPCOPT+=$(CROSSOPT)'#010+
@@ -1700,7 +1700,7 @@ const fpcmakeini : array[0..260,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+
- '# or if -sh is ','used'#010+
+ '# or if -sh is',' used'#010+
'ifneq (,$(filter -sh,$(COMPILER)))'#010+
'UseEXECPPAS=1'#010+
'endif'#010+
@@ -1713,7 +1713,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'EXECPPAS='#010+
'else'#010+
'ifdef RUNBATCH'#010+
- 'EXECPPAS:=@$(RUNBATCH) $(PPA','S)'#010+
+ 'EXECPPAS:=@$(RUNBATCH) $(PP','AS)'#010+
'else'#010+
'EXECPPAS:=@$(PPAS)'#010+
'endif'#010+
@@ -1727,7 +1727,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'.PHONY: fpc_loaders'#010+
#010+
- 'ifneq ($(TARG','ET_LOADERS),)'#010+
+ 'ifneq ($(TAR','GET_LOADERS),)'#010+
'override ALLTARGET+=fpc_loaders'#010+
'override CLEANTARGET+=fpc_loaders_clean'#010+
'override INSTALLTARGET+=fpc_loaders_install'#010+
@@ -1736,7 +1736,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'%$(OEXT): %$(LOADEREXT)'#010+
- 'ifdef COMPILER_U','NITTARGETDIR'#010+
+ 'ifdef COMPILER_','UNITTARGETDIR'#010+
' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
'else'#010+
' $(AS) -o $*$(OEXT) $<'#010+
@@ -1746,7 +1746,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'fpc_loaders_clean:'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
- ' -$(DEL) $(addpref','ix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILE'+
+ ' -$(DEL) $(addpre','fix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILE'+
'S))'#010+
'else'#010+
' -$(DEL) $(LOADEROFILES)'#010+
@@ -1755,7 +1755,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)/,$(LOA','DEROF'+
+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LO','ADEROF'+
'ILES)) $(INSTALL_UNITDIR)'#010+
'else'#010+
' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
@@ -1765,7 +1765,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'[unitrules]'#010+
'#####################################################################'#010+
'# Units'#010+
- '####################################################','################'+
+ '###################################################','#################'+
'#'#010+
#010+
'.PHONY: fpc_units'#010+
@@ -1774,7 +1774,7 @@ 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_I','MPLICI'+
+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_','IMPLICI'+
'TUNITS))'#010+
'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
@@ -1784,7 +1784,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[exerules]'#010+
- '######################','##############################################'+
+ '#####################','###############################################'+
'#'#010+
'# Exes'#010+
'#####################################################################'#010+
@@ -1793,23 +1793,23 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Programs are not needed for a cross installation'#010+
'ifndef CROSSINSTALL'#010+
- 'ifneq ($(TARGET_PROGRAMS)',',)'#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_PROGRAMS','))) $(addprefix $(IMPORTLIBPREF'+
+ 'fix $(STATICLIBEXT),$(TARGET_PROGRAM','S))) $(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 CLEANEXEFILE','S+=$(EXEFILES) $(EXEOFILES)'#010+
+ 'override CLEANEXEFIL','ES+=$(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+
@@ -1820,7 +1820,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'[rstrules]'#010+
'#####################################################################'#010+
'# Resource strings'#010+
- '###############################','#####################################'+
+ '##############################','######################################'+
'#'#010+
#010+
'ifdef TARGET_RSTS'#010+
@@ -1831,7 +1831,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[examplerules]'#010+
- '##################################################################','##'+
+ '#################################################################','###'+
'#'#010+
'# Examples'#010+
'#####################################################################'#010+
@@ -1841,14 +1841,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifneq ($(TARGET_EXAMPLES),)'#010+
'HASEXAMPLES=1'#010+
'override EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPL'+
- 'ES)) $(addsuffix .pa','s,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_'+
+ 'ES)) $(addsuffix .p','as,$(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),$'+
+ 'uffix $','(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$'+
'(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLI'+
'BPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+
- 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$','(TARGET_EXAMPLES'+
+ 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),','$(TARGET_EXAMPLES'+
'))'#010+
#010+
'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
@@ -1856,7 +1856,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifeq ($(OS_TARGET),os2)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
'endif'#010+
- 'ifeq ($(OS_TARGET),e','mx)'#010+
+ 'ifeq ($(OS_TARGET),','emx)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
'endif'#010+
'endif'#010+
@@ -1869,14 +1869,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[compilerules]'#010+
- '##############','######################################################'+
+ '#############','#######################################################'+
'#'#010+
'# General compile rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+
#010+
- '$(FPCMADE): $(ALLDEPENDENCIES',') $(ALLTARGET)'#010+
+ '$(FPCMADE): $(ALLDEPENDENCIE','S) $(ALLTARGET)'#010+
' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
#010+
'fpc_all: $(FPCMADE)'#010+
@@ -1890,7 +1890,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'fpc_release:'#010+
' $(MAKE) all RELEASE=1'#010+
#010+
- '# General compile',' rules, available for both possible .pp and .pas ex'+
+ '# General compil','e rules, available for both possible .pp and .pas ex'+
'tensions'#010+
#010+
'.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+
@@ -1900,7 +1900,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
#010+
'$(COMPILER_TARGETDIR):'#010+
- ' ',' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
+ ' ',' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
#010+
'%$(PPUEXT): %.pp'#010+
' $(COMPILER) $<'#010+
@@ -1914,7 +1914,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
- '%$(EXEEXT): %.p','as'#010+
+ '%$(EXEEXT): %.','pas'#010+
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
@@ -1929,18 +1929,18 @@ const fpcmakeini : array[0..260,1..240] of char=(
'%.res: %.rc'#010+
' windres -i $< -o $@'#010+
#010+
- '# Search paths for .ppu, .pp',', .pas, .lpr, .dpr'#010+
+ '# Search paths for .ppu, .p','p, .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_INCLUD','EDIR)'#010+
+ 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLU','DEDIR)'#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+
@@ -1953,7 +1953,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'SHARED_LIBVERSION=$(FPC_VERSION)'#010+
'endif'#010+
#010+
- 'ifndef SHARED_LIB','NAME'#010+
+ 'ifndef SHARED_LI','BNAME'#010+
'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+
'endif'#010+
#010+
@@ -1964,7 +1964,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Default sharedlib units are all unit objects'#010+
'ifndef SHARED_LIBUNITS'#010+
- 'SHARED_LI','BUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
+ 'SHARED_L','IBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+
'IBUNITS))'#010+
'endif'#010+
@@ -1972,7 +1972,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'fpc_shared:'#010+
'ifdef HASSHAREDLIB'#010+
' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
- 'ifneq ($(SHA','RED_BUILD),n)'#010+
+ 'ifneq ($(SH','ARED_BUILD),n)'#010+
' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+
'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+
'endif'#010+
@@ -1981,7 +1981,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'fpc_shared_install:'#010+
- 'if','neq ($(SHARED_BUILD),n)'#010+
+ 'i','fneq ($(SHARED_BUILD),n)'#010+
'ifneq ($(SHARED_LIBUNITS),)'#010+
'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
@@ -1991,7 +1991,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'[installrules]'#010+
- '###','#################################################################'+
+ '##','##################################################################'+
'#'#010+
'# Install rules'#010+
'#####################################################################'#010+
@@ -1999,7 +1999,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
#010+
'ifdef INSTALL_UNITS'#010+
- 'override',' INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
+ 'overrid','e INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
'endif'#010+
#010+
'ifdef INSTALL_BUILDUNIT'#010+
@@ -2008,28 +2008,28 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'ifdef INSTALLPPUFILES'#010+
- '# Avoid getting the same name twi','ce as some install EXE fail'#010+
+ '# Avoid getting the same name tw','ice 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)) $(su','bst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
+ 'LES)) $(s','ubst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+
'NSTALLPPUFILES)))'#010+
'else'#010+
- 'override INSTALLPPU','LINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
+ 'override INSTALLPP','ULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
')'#010+
'endif'#010+
#010+
'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
- 'override I','NSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
+ 'override ','INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+
'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+
'PUFILENAMES))'#010+
- 'override INSTALLPPULINKFILES=$(wildcard ','$(addprefix $(UNITTARGETDIRP'+
+ 'override INSTALLPPULINKFILES=$(wildcard',' $(addprefix $(UNITTARGETDIRP'+
'REFIX),$(INSTALLPPULINKFILENAMES)))'#010+
'endif'#010+
'# Implicitly install Package.fpc'#010+
@@ -2038,7 +2038,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'ifdef INSTALLEXEFILES'#010+
'ifneq ($(TARGETDIRPREFIX),)'#010+
- 'override INSTALLEXEFILES:=$(addprefix $(TARG','ETDIRPREFIX),$(notdir $('+
+ 'override INSTALLEXEFILES:=$(addprefix $(TAR','GETDIRPREFIX),$(notdir $('+
'INSTALLEXEFILES)))'#010+
'endif'#010+
'endif'#010+
@@ -2048,14 +2048,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
' $(MKDIR) $(INSTALL_BINDIR)'#010+
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
'endif'#010+
- 'ifdef INSTALL_CREATEPACKAGEF','PC'#010+
+ 'ifdef INSTALL_CREATEPACKAGE','FPC'#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+
+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$','(OS_TARGET) Makefile.fpc'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
'endif'#010+
@@ -2064,14 +2064,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 i','nUnix'#010+
+ 'ifdef ','inUnix'#010+
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
'endif'#010+
'endif'#010+
@@ -2082,7 +2082,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#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'+
@@ -2090,7 +2090,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef HASEXAMPLES'#010+
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
- 'if','def EXAMPLESOURCEFILES'#010+
+ 'i','fdef EXAMPLESOURCEFILES'#010+
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+
@@ -2099,7 +2099,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'[distinstallrules]'#010+
- '####################','################################################'+
+ '###################','#################################################'+
'#'#010+
'# Dist Install'#010+
'#####################################################################'#010+
@@ -2110,14 +2110,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[zipinstallrules]'#010+
- '###################','#################################################'+
+ '##################','##################################################'+
'#'#010+
'# Zip'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
#010+
- '# Temporary path to pack a file, can only use',' a single deep'#010+
+ '# Temporary path to pack a file, can only us','e a single deep'#010+
'# subdir, because the deltree can'#039't see the whole tree to remove'#010+
'ifndef PACKDIR'#010+
'ifndef inUnix'#010+
@@ -2128,7 +2128,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'# Maybe create default zipname from packagename'#010+
- 'ifndef ZIPNA','ME'#010+
+ 'ifndef ZIPN','AME'#010+
'ifdef DIST_ZIPNAME'#010+
'ZIPNAME=$(DIST_ZIPNAME)'#010+
'else'#010+
@@ -2143,7 +2143,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# ZipTarget'#010+
'ifndef ZIPTARGET'#010+
'ifdef DIST_ZIPTARGET'#010+
- 'ZIPTARGET=DI','ST_ZIPTARGET'#010+
+ 'ZIPTARGET=D','IST_ZIPTARGET'#010+
'else'#010+
'ZIPTARGET=install'#010+
'endif'#010+
@@ -2161,7 +2161,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'USEZIPWRAPPER=1'#010+
'endif'#010+
#010+
- '# We need to be able to run i','n 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+
@@ -2171,13 +2171,13 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
#010+
'# Create commands to create the zip/tar file'#010+
- 'ZIPCMD_CDPACK',':=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
+ 'ZIPCMD_CDPAC','K:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
'ifdef USETAR'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
'else'#010+
- 'ZIPDESTFILE:=$(DIST_DE','STDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
+ 'ZIPDESTFILE:=$(DIST_D','ESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
'TFILE) *'#010+
'endif'#010+
@@ -2185,20 +2185,20 @@ const fpcmakeini : array[0..260,1..240] of char=(
'fpc_zipinstall:'#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 \,\\,$(ZI','PCMD_ZIP))" >> $(ZIPWRAPPE'+
+ ' $(ECHOREDIR) -e "$(subst \,\\,$(Z','IPCMD_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) >> $(ZIPWRAP','PER)'#010+
+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRA','PPER)'#010+
'endif'#010+
'ifdef inUnix'#010+
' /bin/sh $(ZIPWRAPPER)'#010+
@@ -2211,7 +2211,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_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE',')'#010+
'endif'#010+
' $(DELTREE) $(PACKDIR)'#010+
#010+
@@ -2221,7 +2221,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'fpc_zipexampleinstall:'#010+
'ifdef HASEXAMPLES'#010+
- ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstal','l ZIPSUFFIX=$('+
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinsta','ll ZIPSUFFIX=$('+
'ZIPEXAMPLESUFFIX)'#010+
'endif'#010+
#010+
@@ -2232,7 +2232,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'[cleanrules]'#010+
'#####################################################################'#010+
'# Clean rules'#010+
- '#############################','#######################################'+
+ '############################','########################################'+
'#'#010+
#010+
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
@@ -2240,7 +2240,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'ifdef EXEFILES'#010+
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
'))'#010+
- 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEA','NEXE'+
+ 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLE','ANEXE'+
'DBGFILES))'#010+
'endif'#010+
#010+
@@ -2248,7 +2248,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
'XEEXT), $(CLEAN_PROGRAMS)))'#010+
'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+
- '$(EXEDBGEXT), $(CLEAN_PROGRAM','S)))'#010+
+ '$(EXEDBGEXT), $(CLEAN_PROGRA','MS)))'#010+
'endif'#010+
#010+
'ifdef CLEAN_UNITS'#010+
@@ -2257,19 +2257,19 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'ifdef CLEANPPUFILES'#010+
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
- ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(a','ddprefix $(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),$(DEBUGSYME','XT),$(CLEAN'+
+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYM','EXT),$(CLEAN'+
'PPUFILES))'#010+
'endif'#010+
'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+
'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+
'LENAMES))'#010+
'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+
- 'override CLEANPPULINKFILES=$(wildc','ard $(addprefix $(UNITTARGETDIRPRE'+
+ 'override CLEANPPULINKFILES=$(wild','card $(addprefix $(UNITTARGETDIRPRE'+
'FIX),$(CLEANPPULINKFILENAMES)))'#010+
'endif'#010+
#010+
@@ -2278,7 +2278,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
'# DELTREE instead of DEL because on Mac OS X these are directories'#010+
- 'ifdef CLEANEXED','BGFILES'#010+
+ 'ifdef CLEANEXE','DBGFILES'#010+
' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+
'endif'#010+
'ifdef CLEANPPUFILES'#010+
@@ -2288,7 +2288,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
' -$(DEL) $(CLEANPPULINKFILES)'#010+
'endif'#010+
'ifdef CLEANRSTFILES'#010+
- ' -$(DEL) $(addprefix $(UNIT','TARGETDIRPREFIX),$(CLEANRSTFILES))'+
+ ' -$(DEL) $(addprefix $(UNI','TTARGETDIRPREFIX),$(CLEANRSTFILES))'+
#010+
'endif'#010+
'ifdef CLEAN_FILES'#010+
@@ -2298,14 +2298,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
' -$(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'+
+ ' ','-$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_s'+
'cript.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+
+ ' -$(DEL) $(CLEANEXEFILES',')'#010+
'endif'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
'ifdef CLEANPPUFILES'#010+
@@ -2315,7 +2315,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+
@@ -2325,7 +2325,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
' -$(DELTREE) units'#010+
' -$(DELTREE) bin'#010+
' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+
- '$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(','PPLEXT)'#010+
+ '$(STATICLIBEXT) *$(SHAREDLIBEXT) *$','(PPLEXT)'#010+
'ifneq ($(PPUEXT),.ppu)'#010+
' -$(DEL) *.o *.ppu *.a'#010+
'endif'#010+
@@ -2333,7 +2333,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
' -$(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$('+
+ ' ',' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$('+
'BATCHEXT)'#010+
'ifdef AOUTEXT'#010+
' -$(DEL) *$(AOUTEXT)'#010+
@@ -2343,7 +2343,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'endif'#010+
'ifdef LOCALFPMAKEBIN'#010+
' -$(DEL) $(LOCALFPMAKEBIN)'#010+
- ' -$','(DEL) $(FPMAKEBINOBJ)'#010+
+ ' -','$(DEL) $(FPMAKEBINOBJ)'#010+
'endif'#010+
#010+
'fpc_distclean: cleanall'#010+
@@ -2354,7 +2354,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Base info rules'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fp','c_baseinfo'#010+
+ '.PHONY: f','pc_baseinfo'#010+
#010+
'override INFORULES+=fpc_baseinfo'#010+
#010+
@@ -2364,30 +2364,30 @@ const fpcmakeini : array[0..260,1..240] of char=(
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#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) 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+
- ' @$(E','CHO) TargetSuffix. $(TARGETSUFFIX)'#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)'#010+
- ' @$(ECH','O) Basedir......... $(BASEDIR)'#010+
+ ' @$(EC','HO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
- ' @$(ECHO)',#010+
+ ' @$(ECHO',')'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+
@@ -2395,54 +2395,54 @@ const fpcmakeini : array[0..260,1..240] of char=(
' @$(ECHO)'#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.. $(GINSTAL','L)'#010+
+ ' @$(ECHO) GInstall.. $(GINSTA','LL)'#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)'#010+
' @$(ECHO) == Object info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+
- ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITU','NITS)'#010+
+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICIT','UNITS)'#010+
' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+
' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
- ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLED','IRS)'#010+
+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLE','DIRS)'#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 Files.....','.. $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Install info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
- ' @$(ECHO) ZipPrefix............ $(ZIPPRE','FIX)'#010+
+ ' @$(ECHO) ZipPrefix............ $(ZIPPR','EFIX)'#010+
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
- ' ',' @$(ECHO)'#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_UNITD','IR)'#010+
+ ' @$(ECHO) Install units dir.... $(INSTALL_UNIT','DIR)'#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_DATAD','IR)'#010+
+ ' @$(ECHO) Install data dir..... $(INSTALL_DATA','DIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
@@ -2450,7 +2450,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'[inforules]'#010+
'#####################################################################'#010+
- '# Info ','rules'#010+
+ '# Info',' rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_info'#010+
@@ -2460,7 +2460,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'[makefilerules]'#010+
'#####################################################################'#010+
'# Rebuild Makefile'#010+
- '################','####################################################'+
+ '###############','#####################################################'+
'#'#010+
#010+
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
@@ -2470,8 +2470,8 @@ const fpcmakeini : array[0..260,1..240] of char=(
'fpc_makefile:'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
#010+
- 'fpc_makefile_sub1:'#010+
- 'i','fdef TARGET_DIRS'#010+
+ 'fpc_makefile_sub1:'#010,
+ 'ifdef TARGET_DIRS'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
'T_DIRS))'#010+
'endif'#010+
@@ -2480,7 +2480,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'T_EXAMPLEDIRS))'#010+
'endif'#010+
#010+
- 'fpc_makefile_sub2: $','(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+
+ 'fpc_makefile_sub2: ','$(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+
'T_EXAMPLEDIRS))'#010+
#010+
'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
@@ -2488,7 +2488,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
#010+
'[localmakefile]'#010+
- '########################################################','############'+
+ '#######################################################','#############'+
'#'#010+
'# Local Makefile'#010+
'#####################################################################'#010+
@@ -2499,7 +2499,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
#010+
'[userrules]'#010+
- '#################################################################','###'+
+ '################################################################','####'+
'#'#010+
'# Users rules'#010+
'#####################################################################'#010+
@@ -2507,7 +2507,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'[lclrules]'#010+
'#####################################################################'#010+
'# LCL Rules'#010+
- '#########################################################','###########'+
+ '########################################################','############'+
'#'#010+
#010+
'# LCL Platform'#010+
@@ -2522,7 +2522,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#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+
@@ -2532,7 +2532,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'# Check if the default LCLDIR is correct'#010+
'ifdef DEFAULT_LCLDIR'#010+
- 'override LCLDIR:=$(subst \,/,$(DEFAULT_LC','LDIR))'#010+
+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_L','CLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
@@ -2541,7 +2541,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# 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+
+ ' $(addsuffix /units/','$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
'ifeq ($(LCLDIR),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
@@ -2550,7 +2550,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'# Check for release version'#010+
'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
- ' $(addsuffix /lib/laz','arus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
+ ' $(addsuffix /lib/la','zarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
'ifeq ($(LCLDIR),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
@@ -2559,7 +2559,7 @@ 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 $(LCLDIR',')/.. $(LCLDIR)/../compon'+
+ 'override LCLCOMPONENTDIR=$(wildcard $(LCLDI','R)/.. $(LCLDIR)/../compon'+
'ents $(LCLDIR)/components)'#010+
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
#010+
@@ -2568,7 +2568,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
#010+
'[lclinforules]'#010+
- '#################','###################################################'+
+ '################','####################################################'+
'#'#010+
'# LCL Info rules'#010+
'#####################################################################'#010+
@@ -2578,19 +2578,19 @@ const fpcmakeini : array[0..260,1..240] of char=(
#010+
'lclinfo:'#010+
' @$(ECHO) == LCL info =='#010+
- ' @$(E','CHO)'#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',')'#010+
#010+
'[fpmakeprerules]'#010+
'#####################################################################'#010+
'# fpmake prerules'#010+
'#####################################################################'#010+
'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+
- 'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$','(LTOEXT)'#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'+
@@ -2599,21 +2599,21 @@ const fpcmakeini : array[0..260,1..240] of char=(
'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+
'endif'#010+
'ifdef CPU_TARGET'#010+
- 'FPC_TARGETOPT+=--cpu=$(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_FPMK','UNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+
+ 'UNITDIR_FPMAKE_FPM','KUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+
'IX)'#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+
'endif'#010+
#010+
- 'ifdef FPMAKE_SK','IP_CONFIG'#010+
+ 'ifdef FPMAKE_S','KIP_CONFIG'#010+
'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+
'endif'#010+
#010+
@@ -2621,13 +2621,13 @@ const fpcmakeini : array[0..260,1..240] of char=(
'#####################################################################'#010+
'# fpmake rules'#010+
'#####################################################################'#010+
- '.PHON','Y: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_ex'+
+ '.PHO','NY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_ex'+
'ampleinstall'#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 -F','E%,$(FPCOPT))'#010+
+ 'override FPCOPT:=$(filter-out -','FE%,$(FPCOPT))'#010+
'# Compose general fpmake-parameters'#010+
'ifdef FPMAKEOPT'#010+
'FPMAKE_OPT+=$(FPMAKEOPT)'#010+
@@ -2635,14 +2635,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+
'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+
'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+
- 'FPMAKE_OPT+=$(addprefix -o ,$(','FPCOPT))'#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_V','ER'+
+ 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_','VER'+
'SION)'#010+
'else'#010+
'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+
@@ -2651,7 +2651,7 @@ const fpcmakeini : array[0..260,1..240] of char=(
'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'+
+ '# If no fpmake exists and (dist)clean is',' called, do not try to build'+
' fpmake, it will'#010+
'# most often fail because the dependencies are cleared.'#010+
'# In case of a clean, simply do nothing'#010+
@@ -2659,13 +2659,13 @@ const fpcmakeini : array[0..260,1..240] of char=(
'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_BUI','LD_OPT)'#010+
+ 'IR)) $(FPMAKE_BU','ILD_OPT)'#010+
#010+
'fpc_fpmake: $(FPMAKEBIN)'#010+
' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+
@@ -2674,14 +2674,14 @@ const fpcmakeini : array[0..260,1..240] of char=(
' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+
#010+
'fpc_fpmake_install: $(FPMAKEBIN)'#010+
- ' $(LOCALFPMAKEBIN) install ','$(FPMAKE_OPT) $(FPMAKE_INSTALL'+
+ ' $(LOCALFPMAKEBIN) install',' $(FPMAKE_OPT) $(FPMAKE_INSTALL'+
'_OPT)'#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 wil',' be called twice.'#010+
+ '# a distinstall fpmake install wi','l 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 e0a5dd0860..385715a8f5 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -109,7 +109,7 @@ ifdef inUnix
PATHSEP=/
else
PATHSEP:=$(subst /,\,/)
-# cygwin bash or sh can not handle backslashs
+# cygwin bash or sh can not handle backslashes
ifdef inCygWin
PATHSEP=/
endif