From 5508272cd545ea733e5f204abeb3a7744e7c3019 Mon Sep 17 00:00:00 2001 From: Karoly Balogh Date: Tue, 21 Nov 2023 11:49:56 +0100 Subject: [PATCH] human68k: fpcmake support fixes, files regenerated --- utils/fpcm/fpcmake.inc | 716 ++++++++++++++++++++-------------------- utils/fpcm/fpmake.pp | 2 +- utils/fpcm/revision.inc | 2 +- 3 files changed, 361 insertions(+), 359 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 8703d35957..a766be9dc4 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -16,46 +16,46 @@ const fpcmakeini : array[0..268,1..240] of char=( '# OS categories'#010+ 'BSDs = freebsd netbsd openbsd darwin dragonfly'#010+ 'UNIXs = linux $(BSDs) solaris qnx haiku aix'#010+ - 'LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari'#010+ + 'LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari human68k'#010+ 'OSNeedsComspecToRunBatch = go32v2 watcom'#010+ #010+ - '#Empty target for ru','les that always should run. Needed if'#010+ + '#Empty targ','et for rules that always should run. Needed if'#010+ '#the target is non-phoney, and there is non-phony prereqisites.'#010+ '#Then add FORCE as an prerequisite'#010+ '#See gnu make manual: 4.7 Rules without Commands or Prerequisites'#010+ 'FORCE:'#010+ '.PHONY: FORCE'#010+ #010+ - 'lc = $(subst A,','a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(s'+ + 'lc = $','(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(s'+ 'ubst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$'+ '(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q'+ - ',$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,','u,$(subst V,v,$(subst'+ + ',$(subst R,r,$(subst S,s,$(subst T,t,$','(subst U,u,$(subst V,v,$(subst'+ ' W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$1))))))))))))))))))))))))))'#010+ #010+ #010+ '[osdetect]'#010+ '#####################################################################'#010+ - '# Autodetect source OS (Linux or Dos or Windows NT or OS/2 or othe','r)'+ + '# Autodetect source OS (Linux or Dos or Windows NT or OS/','2 or other)'+ #010+ '# define inUnix when running under Unix like environment'#010+ '# (Linux,FreeBSD,NetBSD,OpenBSD,Darwin,Cygwin)'#010+ '# define inWinNT when running under WinNT'#010+ '# define inOS2 when running under OS/2'#010+ - '# define inCygwin when running under C','ygwin32'#010+ + '# define inCygwin when runnin','g under Cygwin32'#010+ '#####################################################################'#010+ #010+ '# We need only / in the path also remove the current dir,'#010+ '# also remove trailing /'#039's'#010+ 'override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))'#010+ #010+ - '# Detect unix'#010+ - '# Darwin',' is handled specially'#010+ + '# Detect unix',#010+ + '# Darwin is handled specially'#010+ 'ifneq ($(findstring darwin,$(OSTYPE)),)'#010+ 'inUnix=1 #darwin'#010+ 'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+ 'else'#010+ '# Determine if we'#039've a unix searchpath by looking for a ;'#010+ - '# that normally doesn'#039't exists in the unix PATH v','ar.'#010+ + '# that normally doesn'#039't exists in the un','ix PATH var.'#010+ 'ifeq ($(findstring ;,$(PATH)),)'#010+ 'inUnix=1'#010+ 'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+ @@ -65,16 +65,16 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Add path were make is located'#010+ - 'SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))'#010+ + 'SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))','))'#010+ #010+ - '# Sea','rch for PWD'#010+ + '# Search for PWD'#010+ 'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))'#010+ 'ifeq ($(PWD),)'#010+ 'PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))'#010+ 'ifeq ($(PWD),)'#010+ '$(error You need the GNU utils package to use this Makefile)'#010+ 'else'#010+ - 'PWD:=$(first','word $(PWD))'#010+ + 'PWD',':=$(firstword $(PWD))'#010+ 'SRCEXEEXT='#010+ 'endif'#010+ 'else'#010+ @@ -88,8 +88,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(OS),Windows_NT)'#010+ 'inWinNT=1'#010+ 'else'#010+ - 'ifdef OS2_SHELL'#010+ - 'inOS2=1',#010+ + 'ifdef OS2_SHEL','L'#010+ + 'inOS2=1'#010+ 'endif'#010+ 'endif'#010+ 'else'#010+ @@ -109,8 +109,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'ifdef COMSPEC'#010+ - 'ifneq',' ($(filter $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)'#010+ + 'ifdef COMS','PEC'#010+ + 'ifneq ($(filter $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)'#010+ 'ifndef RUNBATCH'#010+ 'RUNBATCH=$(COMSPEC) /C'#010+ 'endif'#010+ @@ -121,9 +121,9 @@ const fpcmakeini : array[0..268,1..240] of char=( ' exists'#010+ '# at the end of a line'#010+ 'ifdef inUnix'#010+ - 'PATHSEP=/'#010+ + 'PATHSEP','=/'#010+ 'else'#010+ - 'P','ATHSEP:=$(subst /,\,/)'#010+ + 'PATHSEP:=$(subst /,\,/)'#010+ '# cygwin bash or sh can not handle backslashes'#010+ 'ifdef inCygWin'#010+ 'PATHSEP=/'#010+ @@ -134,17 +134,17 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef PWD'#010+ 'BASEDIR:=$(subst \,/,$(shell $(PWD)))'#010+ '# For Cygwin we need to replace /cygdrive/c/ with c:/'#010+ - 'ifdef inCygWin'#010+ - 'ifne','q ($(findstring /cygdrive/,$(BASEDIR)),)'#010+ + 'ifdef inCy','gWin'#010+ + 'ifneq ($(findstring /cygdrive/,$(BASEDIR)),)'#010+ 'BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))'#010+ 'BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))'#010+ 'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))'#010+ 'endif'#010+ 'endif'#010+ 'else'#010+ - 'BASEDIR=.'#010+ + 'BASEDIR=','.'#010+ 'endif'#010+ - #010, + #010+ '# Echo is an internal command under OS/2 (and others), so it'#039's alw'+ 'ays found'#010+ 'ifdef inOS2'#010+ @@ -152,7 +152,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))'+ '))'#010+ 'ifeq ($(ECHO),)'#010+ - 'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEE','XT),$(SEARCHPATH)'+ + 'ECHO:=$(strip $(wildcard $(addsuffix /echo','$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#010+ 'ifeq ($(ECHO),)'#010+ 'ECHO=echo'#010+ @@ -168,7 +168,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '[fpcdetect]'#010+ '#####################################################################'#010+ - '# FPC Bina','ry and Version Detection'#010+ + '#',' FPC Binary and Version Detection'#010+ '#####################################################################'#010+ #010+ '# Compatibility with old makefiles'#010+ @@ -178,13 +178,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Try to detect the ppcXXX file to use by using "fpc -PB" option'#010+ - '#',' to query for the default ppcXXX the fpc executable tries. When'#010+ + '# Try to detect the ppcXXX file to use by using "fpc -PB"',' option'#010+ + '# to query for the default ppcXXX the fpc executable tries. When'#010+ '# fpc is not found use ppc386 by default. Also when fpc -PB gives'#010+ '# an error ppc386 will be used.'#010+ 'ifndef FPC'#010+ '# check if fpc exists'#010+ - 'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$','(SRCEXEEXT),$(SEARCHPAT'+ + 'FPCPROG:=$(strip $(wildcard $(addsuf','fix /fpc$(SRCEXEEXT),$(SEARCHPAT'+ 'H))))'#010+ 'ifneq ($(FPCPROG),)'#010+ 'FPCPROG:=$(firstword $(FPCPROG))'#010+ @@ -193,13 +193,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'else'#010+ 'FPC:=$(shell $(FPCPROG) -PB)'#010+ 'endif'#010+ - '# Older fpc executables didn'#039't support it and retu','rn'#010+ + '# Older fpc executables didn'#039't support it',' and return'#010+ '# Error: Illegal processor... If found then fallback to ppc386'#010+ 'ifneq ($(findstring Error,$(FPC)),)'#010+ 'override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEX'+ 'EEXT),$(SEARCHPATH)))))'#010+ 'else'#010+ - '# if the cross compiler is not found, f','all back to fpc'#010+ + '# if the cross compiler is not',' found, fall back to fpc'#010+ 'ifeq ($(strip $(wildcard $(FPC))),)'#010+ 'FPC:=$(firstword $(FPCPROG))'#010+ 'endif'#010+ @@ -207,8 +207,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'else'#010+ '# fpc binary not found, fallback to ppc386'#010+ 'override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEX'+ - 'EEXT),$(SEARCHPATH)))))'#010+ - 'endif',#010+ + 'EEXT),$(SEARCHPATH))',')))'#010+ + 'endif'#010+ 'endif'#010+ #010+ '# Get a clean executable name'#010+ @@ -217,7 +217,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #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+ + 'FOUNDFPC:=$','(strip $(wildcard $(FPC)))'#010+ 'ifeq ($(FOUNDFPC),)'#010+ 'FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))'#010+ 'ifeq ($(FOUNDFPC),)'#010+ @@ -225,8 +225,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# For 1.1 and up we can use a single compiler call to retrieve'#010+ - '# all ','needed information'#010+ + '# For 1.1 and up we can use a single compiler call to retrie','ve'#010+ + '# all needed information'#010+ 'ifndef FPC_COMPILERINFO'#010+ 'FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#010+ 'endif'#010+ @@ -237,13 +237,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'export FPC FPC_VERSION FPC_COMPILERINFO'#010+ - '# CHECKDEPEND should ','not be exported'#010+ + '# CHECKDEPEN','D should not be exported'#010+ '# This should limit multiple checks'#010+ 'unexport CHECKDEPEND ALLDEPENDENCIES'#010+ #010+ '#####################################################################'#010+ '# FPC Target Detection'#010+ - '#########################################################','###########'+ + '################################################','####################'+ '#'#010+ #010+ '# Fall back to default values if needed'#010+ @@ -258,7 +258,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Retrieve Ta','rget/Source CPU and Target/Source OS'#010+ + '# Re','trieve Target/Source CPU and Target/Source OS'#010+ 'ifndef CPU_SOURCE'#010+ 'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ @@ -267,8 +267,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'ifndef OS_SOURCE'#010+ 'OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))'#010+ - 'endif'#010+ - 'ifndef ','OS_TARGET'#010+ + 'endi','f'#010+ + 'ifndef OS_TARGET'#010+ 'OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ #010+ @@ -277,7 +277,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'L_SUB_TARGET=$(call lc,$(SUB_TARGET))'#010+ 'FULL_TARGET:=$(CPU_TARGET)-$(OS_TARGET)-$(L_SUB_TARGET)'#010+ 'else'#010+ - 'FULL_TARGET:=$(CPU_TARGET',')-$(OS_TARGET)'#010+ + 'FULL_TARGET:=$(C','PU_TARGET)-$(OS_TARGET)'#010+ 'endif'#010+ #010+ '#'#010+ @@ -286,7 +286,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '#'#010+ 'CPU_OS_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ 'ifdef SUB_SOURCE'#010+ - 'L_SUB_SOURCE=$(call lc,$(SUB','_SOURCE))'#010+ + 'L_SUB_SOURCE=$(call',' lc,$(SUB_SOURCE))'#010+ 'FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)-$(L_SUB_SOURCE)'#010+ 'else'#010+ 'FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ @@ -298,8 +298,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'else'#010+ 'ifeq ($(CPU_TARGET),armel)'#010+ 'ARCH=arm'#010+ - 'override FPCOPT+=-CaEABI'#010+ - 'e','lse'#010+ + 'override FPCOPT+=','-CaEABI'#010+ + 'else'#010+ 'ARCH=$(CPU_TARGET)'#010+ 'endif'#010+ 'endif'#010+ @@ -314,14 +314,14 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ #010+ - 'ifeq ($(CPU_OS_TARGET),arm-embedded',')'#010+ + 'ifeq ($(CPU_OS_TARGET),arm','-embedded)'#010+ 'ifeq ($(SUBARCH),)'#010+ '# 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 SUBARCH=armv7m) must be defined)'#010+ 'endif'#010+ - 'override FPCOPT+=-Cp$(SU','BARCH)'#010+ + 'override FPCOPT','+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ 'ifeq ($(CPU_OS_TARGET),avr-embedded)'#010+ @@ -329,7 +329,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# 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. SUBA'+ - 'RCH=avr25 or SUBARCH=avr35) ','must be defined)'#010+ + 'RCH=avr25 or SUBARC','H=avr35) must be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ @@ -338,7 +338,7 @@ const fpcmakeini : array[0..268,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 mipsel-embedded, a su','b-architecture (e.g.'+ + '$(error When compiling for mipsel-embed','ded, a sub-architecture (e.g.'+ ' SUBARCH=pic32mx) must be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ @@ -347,7 +347,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(CPU_OS_TARGET),xtensa-embedded)'#010+ 'ifeq ($(SUBARCH),)'#010+ '$(error When compiling for xtensa-embedded, a sub-architecture (e.g. S'+ - 'UBARCH=lx106',' or SUBARCH=lx6) must be defined)'#010+ + 'UBA','RCH=lx106 or SUBARCH=lx6) must be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ @@ -355,7 +355,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(CPU_OS_TARGET),xtensa-freertos)'#010+ 'ifeq ($(SUBARCH),)'#010+ '$(error When compiling for xtensa-freertos, a sub-architecture (e.g. S'+ - 'UBARCH=lx106 or SUBARCH=lx6) must',' be defined)'#010+ + 'UBARCH=lx106 or SUBARCH=','lx6) must be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ @@ -363,18 +363,18 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(CPU_OS_TARGET),arm-freertos)'#010+ 'ifeq ($(SUBARCH),)'#010+ '$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBA'+ - 'RCH=armv6m or SUBARCH=armv7em) must be defined)'#010+ + 'RCH=armv6m or SUBARCH=armv7em) must be defined)'#010, 'endif'#010+ - 'ove','rride FPCOPT+=-Cp$(SUBARCH)'#010+ + 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ '# 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+ 'TARGETSUFFIX=$(OS_TARGET)'#010+ - 'SOURCESUFFIX=$(OS_SOURCE)'#010+ + 'SOURCESUFFIX=$(OS_SOURCE)',#010+ 'else'#010+ - 'ifn','eq ($(filter $(OS_TARGET),$(LIMIT83fs)),)'#010+ + 'ifneq ($(filter $(OS_TARGET),$(LIMIT83fs)),)'#010+ 'TARGETSUFFIX=$(OS_TARGET)'#010+ 'else'#010+ 'TARGETSUFFIX=$(FULL_TARGET)'#010+ @@ -386,14 +386,14 @@ const fpcmakeini : array[0..268,1..240] of char=( '#'#010+ '# We may need to switch to FULL_TARGET/FULL_TARGET'#010+ '#'#010+ - 'ifneq ($(CPU_OS_TARGET','),$(CPU_OS_SOURCE))'#010+ + 'ifneq ($(CPU_','OS_TARGET),$(CPU_OS_SOURCE))'#010+ 'CROSSCOMPILE=1'#010+ 'endif'#010+ #010+ '# Check if the Makefile supports this target, but not'#010+ '# when the make target is to rebuild the makefile'#010+ 'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+ - 'ifeq ($(filter $(CPU_OS_TARGET),$(MAKEFILETARGE','TS)),)'#010+ + 'ifeq ($(filter $(CPU_OS_TARGET),$(MAKE','FILETARGETS)),)'#010+ '$(error The Makefile doesn'#039't support target $(FULL_TARGET), please'+ ' run fpcmake first)'#010+ 'endif'#010+ @@ -404,9 +404,9 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'ifneq ($(filter $(OS_TARGET),$(BSDs)),)'#010+ 'BSDhier=1'#010+ - 'endif'#010+ + 'end','if'#010+ #010+ - '# Det','ect Linux, will 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+ @@ -421,12 +421,12 @@ const fpcmakeini : array[0..268,1..240] of char=( 'export BUILDNATIVE'#010+ 'endif'#010+ #010+ - 'export OS_T','ARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE SUB_TARGET SUB'+ + 'ex','port OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE SUB_TARGET SUB'+ '_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'+ ' CPU_OS_TARGET CPU_OS_SOURCE'#010+ #010+ '[fpmakefpcdetect]'#010+ - '#################################################################','###'+ + '########################################################','############'+ '#'#010+ '# FPC Binary and Version Detection'#010+ '#####################################################################'#010+ @@ -435,22 +435,22 @@ const fpcmakeini : array[0..268,1..240] of char=( '# native compiler.'#010+ 'ifndef FPCFPMAKE'#010+ #010+ - 'ifdef CROSSCOMPILE'#010+ - '# Searc','h for the (native) ppc compiler which is used to do the lates'+ - 't build'#010+ + 'ifdef CROSSCOMPIL','E'#010+ + '# Search for the (native) ppc compiler which is used to do the latest '+ + 'build'#010+ '# of the native rtl'#010+ #010+ 'ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDI'+ 'R)))),)'#010+ - '# If that compiler is not found, use the common, installed native comp'+ - 'il','er'#010+ + '# If that compiler is not found, use the common, installed nati','ve co'+ + 'mpiler'#010+ '# Note that in this case FPCFPMAKE is not exported, because it could b'+ 'e that'#010+ '# a more suitable compiler is compiled later on'#010+ '# check if fpc exists'#010+ 'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#010+ - 'ifneq ($(FPCPROG','),)'#010+ + 'ifneq (','$(FPCPROG),)'#010+ 'FPCPROG:=$(firstword $(FPCPROG))'#010+ 'FPCFPMAKE:=$(shell $(FPCPROG) -PB)'#010+ '# if a native compiler is not found, fall back to fpc'#010+ @@ -458,14 +458,14 @@ const fpcmakeini : array[0..268,1..240] of char=( 'FPCFPMAKE:=$(firstword $(FPCPROG))'#010+ 'endif'#010+ 'else'#010+ - '# fpc binary not found, fa','llback to ppc386'#010+ + '# fpc binary not ','found, fallback to ppc386'#010+ 'override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$'+ '(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 d','o that on the fly.'#010+ + '# evaluate the variable he','re, but do that on the fly.'#010+ 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(F'+ 'PCDIR))))'#010+ 'FPMAKE_SKIP_CONFIG=-n'#010+ @@ -481,14 +481,14 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ #010+ - '[fpcdirche','ckenv]'#010+ + '[','fpcdircheckenv]'#010+ '#####################################################################'#010+ '# FPCDIR Setting'#010+ '#####################################################################'#010+ #010+ '# Test FPCDIR to look if the RTL dir exists'#010+ 'ifdef FPCDIR'#010+ - 'override FPCDIR:=$','(subst \,/,$(FPCDIR))'#010+ + 'override ','FPCDIR:=$(subst \,/,$(FPCDIR))'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ @@ -499,7 +499,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Default FPCDIR from Makefile.fpc'#010+ 'ifdef DEFAULT_FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ - 'override FPCDIR:=$(subst \,/,','$(DEFAULT_FPCDIR))'#010+ + 'override FPCDIR:=$(s','ubst \,/,$(DEFAULT_FPCDIR))'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ @@ -511,14 +511,14 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(FPCDIR),wrong)'#010+ 'ifdef inUnix'#010+ 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ - 'ifeq ($(wildcar','d $(FPCDIR)/units),)'#010+ + 'ifeq (','$(wildcard $(FPCDIR)/units),)'#010+ 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+ 'suffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ - 'ifeq ($(wildcard $(addprefix $','(FPCDIR)/,rtl)),)'#010+ + 'ifeq ($(wildcard $(ad','dprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR:=$(BASEDIR)'#010+ @@ -530,15 +530,15 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Cross binarie','s dir'#010+ + '# Cros','s binaries dir'#010+ 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+ 'endif'#010+ #010+ '# Default binutils prefix for cross compile when the'#010+ '# crossbindir is not set (except for Darwin)'#010+ - 'ifneq ($(filter $(OS_TARGET),darwin iphonesim ios),)'#010+ - 'if','neq ($(filter $(OS_SOURCE),darwin ios),)'#010+ + 'ifneq ($(filter $(OS_TARGET),darwin iphonesim ','ios),)'#010+ + 'ifneq ($(filter $(OS_SOURCE),darwin ios),)'#010+ 'DARWIN2DARWIN=1'#010+ 'endif'#010+ 'endif'#010+ @@ -549,7 +549,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifneq ($(OS_TARGET),msdos)'#010+ 'ifndef DARWIN2DARWIN'#010+ 'ifneq ($(CPU_TARGET),jvm)'#010+ - 'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TA','RGET)-'#010+ + 'BINUTILSPREFIX=$(CPU_TARGET',')-$(OS_TARGET)-'#010+ #010+ '# For Android use standard NDK prefixes'#010+ 'ifeq ($(OS_TARGET),android)'#010+ @@ -559,7 +559,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#010+ 'BINUTILSPREFIX=i686-linux-android-'#010+ 'else'#010+ - 'BINUTILSPREFIX=$(CPU_TARGET)-l','inux-android-'#010+ + 'BINUTILSPREFIX=$(CPU_','TARGET)-linux-android-'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -575,7 +575,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Try first the full target name, otherwise try only'#010+ '# the OS for backwards compatibility'#010+ - 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETS','UFFIX))'#010+ + 'UNITSDIR:=$(wildcard $(FPCDIR)/units/','$(TARGETSUFFIX))'#010+ 'ifeq ($(UNITSDIR),)'#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ 'endif'#010+ @@ -585,7 +585,8 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[shelltools]'#010+ - '#####################################################################'#010, + '#############################################################','#######'+ + '#'#010+ '# Shell tools'#010+ '#####################################################################'#010+ #010+ @@ -596,9 +597,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'else'#010+ 'ECHOREDIR=$(ECHO)'#010+ 'endif'#010+ - 'endif'#010+ + 'endif'#010, #010+ - '# To cop','y pograms'#010+ + '# To copy pograms'#010+ 'ifndef COPY'#010+ 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ @@ -615,8 +616,8 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# To move pograms'#010+ 'ifndef MOVE'#010+ - 'MOVE:=$(MVPROG) -f'#010+ - 'end','if'#010+ + 'MOVE:=$(MVPRO','G) -f'#010+ + 'endif'#010+ #010+ '# Check delete program'#010+ 'ifndef DEL'#010+ @@ -633,9 +634,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef inUnix'#010+ 'INSTALL:=$(GINSTALL) -c -m 644'#010+ 'else'#010+ - 'INSTALL:=$(COPY)'#010+ + 'INSTALL:=$(COPY)',#010+ + 'endif'#010+ 'endif'#010+ - 'en','dif'#010+ #010+ '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ @@ -651,7 +652,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'MKDIR:=$(GINSTALL) -m 755 -d'#010+ 'endif'#010+ #010+ - 'export ECHOREDIR COPY COPYTREE MOVE DE','L DELTREE INSTALL INSTALLEXE M'+ + 'export ECHOREDIR COPY COPYTRE','E MOVE DEL DELTREE INSTALL INSTALLEXE M'+ 'KDIR'#010+ #010+ #010+ @@ -661,7 +662,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '#####################################################################'#010+ #010+ '# Units dir'#010+ - 'ifdef REQUIRE_','UNITSDIR'#010+ + 'ifdef',' REQUIRE_UNITSDIR'#010+ 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ 'endif'#010+ #010+ @@ -672,7 +673,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+ - '# When zipping use the target os default, when ','normal install then'#010+ + '# When zipping use the target os defau','lt, when normal install then'#010+ '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ @@ -686,7 +687,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# When install',' prefix is not set try to use prefix'#010+ + '# Whe','n install prefix is not set try to use prefix'#010+ 'ifndef INSTALL_PREFIX'#010+ 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ @@ -697,8 +698,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifndef INSTALL_PREFIX'#010+ 'ifdef UNIXHier'#010+ 'INSTALL_PREFIX=/usr/local'#010+ - 'else'#010+ - 'ifdef I','NSTALL_FPCPACKAGE'#010+ + 'els','e'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ @@ -709,8 +710,8 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+ '# used recursively for all subdirs'#010+ - 'ifdef INSTALL_FPCSUBDIR'#010+ - 'export IN','STALL_FPCSUBDIR'#010+ + 'ifdef INSTALL_FPCSUBDIR'#010, + 'export INSTALL_FPCSUBDIR'#010+ 'endif'#010+ #010+ '# Where to place the resulting zip files'#010+ @@ -722,7 +723,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# EXE/PPU Target directories'#010+ 'ifndef COMPILER_UNITTARGETDIR'#010+ 'ifdef PACKAGEDIR_MAIN'#010+ - 'COMPILER_UNITTARGETDIR=','$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ + 'COMPILER_UNITT','ARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ 'else'#010+ 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ 'endif'#010+ @@ -733,14 +734,14 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '#####################################################################'#010+ - '# Install Di','rectories'#010+ + '# I','nstall Directories'#010+ '#####################################################################'#010+ #010+ '# set the base directory where to install everything'#010+ 'ifndef INSTALL_BASEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/','$(FPC_VERSION)'#010+ + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)','/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ @@ -752,14 +753,14 @@ const fpcmakeini : array[0..268,1..240] of char=( '# set the directory where to install the binaries'#010+ 'ifndef INSTALL_BINDIR'#010+ 'ifdef UNIXHier'#010+ - 'INSTALL_BINDIR:=$(I','NSTALL_PREFIX)/bin'#010+ + 'INSTALL_BI','NDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ '# for FPC packages install the binaries under their target subdir'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef CROSSCOMPILE'#010+ 'ifdef CROSSINSTALL'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX',')'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOU','RCESUFFIX)'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ @@ -772,7 +773,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ - 'INSTALL_UNITDIR:=$(INSTALL','_BASEDIR)/units/$(TARGETSUFFIX)'#010+ + 'INSTALL_UNITDIR:=','$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef PACKAGE_NAME'#010+ 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ @@ -783,7 +784,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Where to install shared libraries'#010+ 'ifndef INSTALL_LIBDIR'#010+ 'ifdef UNIXHier'#010+ - 'INSTALL_LIBDIR:=$(IN','STALL_PREFIX)/lib'#010+ + 'INSTALL_LIB','DIR:=$(INSTALL_PREFIX)/lib'#010+ 'else'#010+ 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ 'endif'#010+ @@ -796,9 +797,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'SRCPREFIXDIR=share/src'#010+ 'else'#010+ 'ifdef linuxHier'#010+ - 'SRCPREFIXDIR=share/src'#010+ + 'SRCPREFIXDIR=share/src',#010+ 'else'#010+ - 'SRC','PREFIXDIR=src'#010+ + 'SRCPREFIXDIR=src'#010+ 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -806,7 +807,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR',')/fpc-$(FPC_VERSI'+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRC','PREFIXDIR)/fpc-$(FPC_VERSI'+ 'ON)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ @@ -816,7 +817,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source','/$(INSTALL_FPCSUBDIR)/$('+ + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDI','R)/source/$(INSTALL_FPCSUBDIR)/$('+ 'PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ @@ -828,8 +829,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Where the doc files will be stored'#010+ - 'ifndef INSTALL_DOCDIR'#010+ - 'if','def UNIXHier'#010+ + 'ifndef INSTALL_','DOCDIR'#010+ + 'ifdef UNIXHier'#010+ 'ifdef BSDhier'#010+ 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ @@ -841,8 +842,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ - '(PACKAGE_NAME)'#010+ - 'el','se'#010+ + '(PACKAGE','_NAME)'#010+ + 'else'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+ 'CKAGE_VERSION)'#010+ 'endif'#010+ @@ -852,8 +853,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'else'#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ + 'en','dif'#010+ 'endif'#010+ - 'endif',#010+ #010+ '# Where to install the examples, under linux we use the doc dir'#010+ '# because the copytree command will create a subdir itself'#010+ @@ -862,7 +863,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREF','IX)/share/examples/fpc-$(FPC_VERSI'+ + 'INSTALL_EXAMPLEDIR:=$(INS','TALL_PREFIX)/share/examples/fpc-$(FPC_VERSI'+ 'ON)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ @@ -873,9 +874,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'else'#010+ + 'else'#010, #010+ - 'ifdef BS','Dhier'#010+ + 'ifdef BSDhier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+ '(PACKAGE_VERSION)'#010+ 'else'#010+ @@ -883,7 +884,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+ 'GE_VERSION)'#010+ 'else'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/','doc/$(PACKAGE_NAME)-$(PACKAGE_'+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL','_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_'+ 'VERSION)'#010+ 'endif'#010+ #010+ @@ -898,7 +899,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the some',' extra (data)files will be stored'#010+ + '# Where',' the some extra (data)files will be stored'#010+ 'ifndef INSTALL_DATADIR'#010+ 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ @@ -907,20 +908,21 @@ const fpcmakeini : array[0..268,1..240] of char=( 'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+ 'endif'#010+ #010+ - '#####################################################################', - #010+ + '############################################################','########'+ + '#'#010+ '# Cross compile dirs'#010+ '#####################################################################'#010+ #010+ 'ifdef CROSSCOMPILE'#010+ '# Directory where the cross compile tools are stored.'#010+ - '# First check if they are available in FPCDIR. If no targets/ subdir'#010+ - '# is ','found use the targets/ subdir in INSTALL_BASEDIR.'#010+ + '# First check if they are available in FPCDIR. If no targets/ sub','dir'+ + #010+ + '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ - '(FULL_SOURCE))'#010, + '(FULL_','SOURCE))'#010+ 'endif'#010+ 'endif'#010+ 'else'#010+ @@ -935,7 +937,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Amd64 to i386?'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'ifneq ($(filter x86_64,$(shell uname -a)),)'#010+ - 'ifeq ($(BINUTILSPRE','FIX),)'#010+ + 'ifeq ($(BI','NUTILSPREFIX),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-m32'#010+ @@ -947,7 +949,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '#CPU_TARGET=i386'#010+ 'ifeq ($(CPU_TARGET),powerpc)'#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+ 'CROSSGCCOPT=-m32'#010+ 'endif'#010+ @@ -957,8 +959,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(CPU_TARGET),powerpc64)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#010+ - 'else'#010+ - 'CROSSGCCO','PT=-m64'#010+ + 'else'#010, + 'CROSSGCCOPT=-m64'#010+ 'endif'#010+ '#BINUTILSPREFIX'#010+ 'endif'#010+ @@ -968,7 +970,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(BINUTILSPREFIX),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'else'#010+ - 'CROSSGCCOPT=-m32',#010+ + 'CROSSGC','COPT=-m32'#010+ 'endif'#010+ '#BINUTILSPREFIX'#010+ 'endif'#010+ @@ -978,7 +980,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# 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-libg','cc-file-name`)'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -p','rint-libgcc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-mabi=64'#010+ 'endif'#010+ @@ -988,7 +990,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# gcc mips seems not to recognize -m32/-m64'#010+ 'ifneq ($(filter $(CPU_TARGET),mips mipsel),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `','gcc -mabi=32 -print-libgcc-file-name`)'#010+ + 'GCCLIBDIR:=$(shell ','dirname `gcc -mabi=32 -print-libgcc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-mabi=32'#010+ 'endif'#010+ @@ -999,7 +1001,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(GCCLIBDIR),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)'#010+ 'endif'#010+ - '#GCCLIBDIR='#010, + '#GC','CLIBDIR='#010+ 'else'#010+ 'ifeq ($(CROSSGCCOPT),)'#010+ 'CROSSGCCOPT=-g'#010+ @@ -1013,14 +1015,14 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Check if FPCFPMAKE compiler is same target as FPC'#010+ 'ifdef FPCFPMAKE'#010+ 'FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)'#010+ - 'ifeq ($(CPU_TARGET),','$(FPCFPMAKE_CPU_TARGET))'#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 loongarch64),)'#010+ - 'FPCMAKE_CROSSGCCOPT=-m64'#010+ - 'el','se'#010+ + 'FPCMAKE_CROSSGCCOP','T=-m64'#010+ + 'else'#010+ 'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),mips64 mips64el),)'#010+ 'FPCMAKE_CROSSGCCOPT=-mabi=64'#010+ 'else'#010+ @@ -1028,7 +1030,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'FPCMAKE_CROSSGCCOPT=-mabi=32'#010+ 'else'#010+ 'ifeq ($(FPCFPMAKE_CPU_TARGET),riscv64)'#010+ - 'FPCMAKE_CROSSGCC','OPT=-mabi=lp64'#010+ + 'FPCMAKE','_CROSSGCCOPT=-mabi=lp64'#010+ 'else'#010+ 'ifeq ($(FPCFPMAKE_CPU_TARGET),riscv32)'#010+ 'FPCMAKE_CROSSGCCOPT=-mabi=ilp32'#010+ @@ -1040,8 +1042,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ '#loongarch64'#010+ 'endif'#010+ - '#riscv32'#010+ - 'endif',#010+ + '#risc','v32'#010+ + 'endif'#010+ '#riscv64'#010+ 'endif'#010+ '#mips/mipsel'#010+ @@ -1056,7 +1058,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ '#def FPCFPMAKE'#010+ #010+ - 'ifndef FPCMAK','EGCCLIBDIR'#010+ + 'ifnd','ef FPCMAKEGCCLIBDIR'#010+ 'FPCMAKEGCCLIBDIR:=$(shell dirname `gcc -print-libgcc-file-name`)'#010+ 'endif'#010+ #010+ @@ -1065,7 +1067,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+ 'XT),$(SEARCHPATH))))'#010+ 'ifneq ($(CROSSGCC),)'#010+ - 'GCCLIBDIR:=$','(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc'+ + 'GCC','LIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc'+ '-file-name`)'#010+ 'endif'#010+ '#CROSSGCC='#010+ @@ -1078,7 +1080,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(OS_SOURCE),netbsd)'#010+ 'OTHERLIBDIR:=/usr/pkg/lib'#010+ 'endif'#010+ - 'export GCCLIBDIR FPCMAKEGCC','LIBDIR OTHERLIBDIR'#010+ + 'export GCCLIBDIR F','PCMAKEGCCLIBDIR OTHERLIBDIR'#010+ 'endif'#010+ #010+ #010+ @@ -1087,7 +1089,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Default extensions'#010+ '#####################################################################'#010+ #010+ - '# Default needed extensions (Go32v2,Li','nux)'#010+ + '# Default needed extensions (','Go32v2,Linux)'#010+ 'BATCHEXT=.bat'#010+ 'LOADEREXT=.as'#010+ 'EXEEXT=.exe'#010+ @@ -1103,7 +1105,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'STATICLIBPREFIX=libp'#010+ 'IMPORTLIBPREFIX=libimp'#010+ 'RSTEXT=.rst'#010+ - '# external debug i','nfo for executable'#010+ + '# externa','l debug info for executable'#010+ 'EXEDBGEXT=.dbg'#010+ '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ ' has this'#010+ @@ -1116,7 +1118,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ - 'STATICLIBPREFI','X='#010+ + 'STATI','CLIBPREFIX='#010+ 'SHORTSUFFIX=dos'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ @@ -1133,7 +1135,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Android native'#010+ 'ifneq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_TARGET),an','droid)'#010+ + 'ifeq ($(OS_T','ARGET),android)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1152,8 +1154,8 @@ const fpcmakeini : array[0..268,1..240] of char=( '# DragonFly BSD'#010+ 'ifeq ($(OS_TARGET),dragonfly)'#010+ 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ - 'HASSHARE','DLIB=1'#010+ + 'EXEEXT=',#010+ + 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=df'#010+ 'endif'#010+ #010+ @@ -1173,8 +1175,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'SHORTSUFFIX=nbs'#010+ 'endif'#010+ #010+ - '# OpenBSD'#010+ - 'ifeq ($(O','S_TARGET),openbsd)'#010+ + '# OpenBSD'#010, + 'ifeq ($(OS_TARGET),openbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1192,7 +1194,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT','=.dll'#010+ + 'SHA','REDLIBEXT=.dll'#010+ 'SHORTSUFFIX=os2'#010+ 'ECHO=echo'#010+ 'IMPORTLIBPREFIX='#010+ @@ -1210,8 +1212,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Amiga'#010+ - 'ifeq ($(OS_TARGET),amiga)'#010+ - 'EXEEXT='#010, + 'ifeq ($(OS_TARGET),amiga)',#010+ + 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=amg'#010+ 'endif'#010+ @@ -1231,7 +1233,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Atari'#010+ - 'ifeq ($(OS','_TARGET),atari)'#010+ + 'i','feq ($(OS_TARGET),atari)'#010+ 'EXEEXT=.ttp'#010+ 'SHORTSUFFIX=ata'#010+ 'endif'#010+ @@ -1251,7 +1253,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Solaris'#010+ - 'ifeq ($(OS_TARGET),solaris',')'#010+ + 'ifeq ($(OS_TARGET','),solaris)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=sun'#010+ @@ -1270,9 +1272,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=nw'#010+ 'IMPORTLIBPREFIX=imp'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ - '# Netw','are libc'#010+ + '# Netware libc'#010+ 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ @@ -1286,9 +1288,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'EXEEXT='#010+ 'DEBUGSYMEXT=.xcoff'#010+ 'SHORTSUFFIX=mac'#010+ - 'IMPORTLIBPREFIX=imp'#010+ + 'IMPORTLIBPREFIX=im','p'#010+ 'endif'#010+ - #010, + #010+ '# Darwin'#010+ 'ifneq ($(filter $(OS_TARGET),darwin iphonesim ios),)'#010+ 'BATCHEXT=.sh'#010+ @@ -1305,8 +1307,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'SHORTSUFFIX=gba'#010+ 'endif'#010+ #010+ - '# Symbian OS'#010+ - 'ifeq ($(','OS_TARGET),symbian)'#010+ + '# Symbian OS',#010+ + 'ifeq ($(OS_TARGET),symbian)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=symbian'#010+ 'endif'#010+ @@ -1322,10 +1324,10 @@ const fpcmakeini : array[0..268,1..240] of char=( 'EXEEXT=.dol'#010+ 'SHAREDLIBEXT=.so'#010+ 'SHORTSUFFIX=wii'#010+ - 'endif'#010+ + 'endif',#010+ #010+ '# AIX'#010+ - 'i','feq ($(OS_TARGET),aix)'#010+ + 'ifeq ($(OS_TARGET),aix)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHAREDLIBEXT=.a'#010+ @@ -1342,7 +1344,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Android java'#010+ 'ifeq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_TARGET),an','droid)'#010+ + 'ifeq ($(OS_T','ARGET),android)'#010+ 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ 'SHAREDLIBEXT=.jar'#010+ @@ -1360,7 +1362,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# MSX-DOS'#010+ 'ifeq ($(OS_TARGET),msxdos)'#010+ 'STATICLIBPREFIX='#010+ - 'STATICLIBEXT=.a',#010+ + 'STATIC','LIBEXT=.a'#010+ 'SHORTSUFFIX=msd'#010+ 'endif'#010+ #010+ @@ -1379,7 +1381,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Win16'#010+ - 'ifeq ($(OS_TARGET),wi','n16)'#010+ + 'ifeq ($(OS_T','ARGET),win16)'#010+ 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ @@ -1397,8 +1399,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ #010+ - '# For 8.3 limited OS'#039's the short suffixes'#010+ - '# Ot','herwise use the full source/target names'#010+ + '# For 8.3 limited OS'#039's the short suff','ixes'#010+ + '# Otherwise use the full source/target names'#010+ 'ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)'#010+ 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ @@ -1406,8 +1408,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ZIPSOURCESUFFIX=src'#010+ 'ZIPEXAMPLESUFFIX=exm'#010+ 'else'#010+ - 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+ - 'ZIPS','OURCESUFFIX=.source'#010+ + 'FPCMADE=fpcmade.$(TARGETSUF','FIX)'#010+ + 'ZIPSOURCESUFFIX=.source'#010+ 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ @@ -1419,7 +1421,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '[defaulttools]'#010+ - '#######################################','#############################'+ + '##############################','######################################'+ '#'#010+ '# Default Tools'#010+ '#####################################################################'#010+ @@ -1428,7 +1430,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#010+ - 'RCNAME=$(BI','NUTILSPREFIX)rc'#010+ + 'RC','NAME=$(BINUTILSPREFIX)rc'#010+ 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ @@ -1440,8 +1442,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# linker, but probably not used'#010+ - 'ifnde','f LDPROG'#010+ + '# linker, but probably not u','sed'#010+ + 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1456,9 +1458,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'else'#010+ 'RCPROG=$(RCNAME)'#010+ 'endif'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ - '# A','rchiver'#010+ + '# Archiver'#010+ 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ @@ -1470,7 +1472,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# NASM assembler, redefine it if cross compiling'#010+ 'ifndef NASMPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(S','RCEXEEXT)'#010+ + 'NASMPROG=$(CROSSBINDIR)/$(NAS','MNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'NASMPROG=$(NASMNAME)'#010+ 'endif'#010+ @@ -1488,9 +1490,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'PPAS=./ppas$(SRCBATCHEXT)'#010+ 'else'#010+ 'PPAS=ppas$(SRCBATCHEXT)'#010+ - 'endif'#010+ + 'end','if'#010+ #010+ - '# ldc','onfig to rebuild .so cache'#010+ + '# ldconfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ 'LDCONFIG=ldconfig'#010+ 'else'#010+ @@ -1510,7 +1512,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Tar options'#010+ 'ifeq ($(USETAR),bz2)'#010+ 'TAROPT=vj'#010+ - 'TAREXT=.tar.','bz2'#010+ + 'TAR','EXT=.tar.bz2'#010+ 'else'#010+ 'TAROPT=vz'#010+ 'TAREXT=.tar.gz'#010+ @@ -1522,7 +1524,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load commandlin','e OPTDEF and add FPC_CPU define, for compiling the'#010+ + '# Load c','ommandline OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ 'override FPCOPTDEF=$(ARCH)'#010+ @@ -1530,8 +1532,8 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ - 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ - 'ove','rride FPCOPT+=-T$(OS_TARGET)'#010+ + 'ifneq ($(OS_TARGET),$(OS_SOU','RCE))'#010+ + 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ @@ -1541,7 +1543,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ - 'override FPMAKE_BUIL','D_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ + 'override FP','MAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ @@ -1553,7 +1555,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# When BINUTILSPREFIX is given and we are',' not cross-compiling then u'+ + '# When BINUTILSPREFIX is given a','nd we are not cross-compiling then u'+ 'se'#010+ '# it while compiling the fpmake file. (For example to build i386-freeb'+ 'sd'#010+ @@ -1561,7 +1563,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ - 'override FPMAKE_BUI','LD_OPT+=-XP$(BINUTILSPREFIX)'#010+ + 'override F','PMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1572,7 +1574,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ - 'ifdef OBJDIR'#010, + 'ifde','f OBJDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ @@ -1586,8 +1588,8 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Smartlinking creation'#010+ 'ifdef CREATESMART'#010+ - 'override FPCOPT+=-CX'#010+ - 'endi','f'#010+ + 'override FPCOPT+','=-CX'#010+ + 'endif'#010+ #010+ '# Debug'#010+ 'ifdef DEBUG'#010+ @@ -1600,9 +1602,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef RELEASE'#010+ 'FPCCPUOPT:=-O2'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ - 'override FPCOPTDEF+=RELEASE'#010+ + 'override FPCOPTDEF+=RELEAS','E'#010+ 'endif'#010+ - #010, + #010+ '# Strip'#010+ 'ifdef STRIP'#010+ 'override FPCOPT+=-Xs'#010+ @@ -1619,8 +1621,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Needed compiler options'#010+ - 'ifdef COMPILER_OPTIONS'#010+ - 'overr','ide FPCOPT+=$(COMPILER_OPTIONS)'#010+ + 'ifdef COMPILER_OPTI','ONS'#010+ + 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ @@ -1628,8 +1630,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef COMPILER_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ - 'ifdef COMPILER_OBJECTDIR'#010+ - 'overr','ide FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ + 'ifdef COMPILER_OBJECT','DIR'#010+ + 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ @@ -1640,7 +1642,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ - '# Target d','irs and the prefix to use for clean/install'#010+ + '#',' Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ @@ -1648,15 +1650,15 @@ const fpcmakeini : array[0..268,1..240] of char=( 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ - '# Unit',' target dir (default is units/-/'#010+ + '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR',')/'#010+ + 'override UNITTARGETDIRPREFIX=$(COMPILER_UNIT','TARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ @@ -1668,13 +1670,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef SYSROOTPATH'#010+ 'override FPCOPT+=-XR$(SYSROOTPATH)'#010+ 'else'#010+ - '# if we are compiling native','ly on aarch64-darwin and if -/Library/De'+ + '# if we are compili','ng natively on aarch64-darwin and if -/Library/De'+ 'veloper/CommandLineTools/SDKs/MacOSX.sdk exists,'#010+ '# add it to the compiler command line'#010+ 'ifeq ($(OS_TARGET),$(OS_SOURCE))'#010+ 'ifeq ($(OS_TARGET),darwin)'#010+ '# so far the only tested one'#010+ - 'ifeq ($(CPU_TARGET),aarc','h64)'#010+ + 'ifeq ($(CPU_TAR','GET),aarch64)'#010+ 'ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk)'+ ',)'#010+ 'override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sd'+ @@ -1689,13 +1691,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'override FPCOPT+=-Cg'#010+ 'endif'#010+ #010+ - '# create alw','ays pic'#039'ed code on x86_64, mips and mipsel'#010+ + '# c','reate 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 riscv'+ - '64 powerpc64),)'#010+ - 'override ','FPCOPT+=-Cg'#010+ + '64 powerpc64),)'#010, + 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1709,8 +1711,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ #010+ - '[command_libc]'#010+ - '# Ad','d GCC lib path if asked'#010+ + '[command_l','ibc]'#010+ + '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'ifdef FPCMAKEGCCLIBDIR'#010+ @@ -1720,7 +1722,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addprefix',' -Fl,$(OTHERLIBDIR))'#010+ + 'override FPCOPT+=$(','addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ @@ -1731,8 +1733,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Override options to compile the fpmake-binary with command-line opti'+ - 'ons provided in FPMAKEBUILDOPT'#010+ - 'ifd','ef FPMAKEBUILDOPT'#010+ + 'ons provided in FPMAKEBUI','LDOPT'#010+ + 'ifdef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ 'endif'#010+ #010+ @@ -1743,7 +1745,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'override FPCOPT+','=@$(CFGFILE)'#010+ + 'overrid','e FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ '# Use the environment to pass commandline options?'#010+ @@ -1754,7 +1756,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'override AFULL_SOURCE=$(C','PU_SOURCE)-$(OS_SOURCE)'#010+ + 'override AFULL_S','OURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ @@ -1767,7 +1769,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Compiler commandline'#010+ 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ #010+ - '# also call ppas i','f with command option -s'#010+ + '# also ca','ll 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+ 'ifneq (,$(filter -sh,$(COMPILER)))'#010+ @@ -1775,7 +1777,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'ifneq (,$(filter -s,$(COMPILER)))'#010+ 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ - 'UseEXECPPAS=1',#010+ + 'UseE','XECPPAS=1'#010+ 'endif'#010+ 'endif'#010+ 'ifneq ($(UseEXECPPAS),1)'#010+ @@ -1791,9 +1793,8 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '[loaderrules]'#010+ '#####################################################################'#010+ - '# Loaders'#010+ - '#########','###########################################################'+ - '#'#010+ + '# Loaders'#010, + '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ @@ -1802,7 +1803,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOAD','EROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'over','ride LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ @@ -1812,7 +1813,7 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPILER_UNITTARGE','TDIR) $(LOADEROFILES)'#010+ + 'fpc_loaders: $(COMPILER_','UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ @@ -1823,7 +1824,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ - ' $(MKDIR) $(INSTALL_UNITD','IR)'#010+ + ' $(MKDIR) $(INST','ALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#010+ @@ -1833,7 +1834,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[unitrules]'#010+ - '##################################','##################################'+ + '#########################','###########################################'+ '#'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -1843,11 +1844,11 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(add','suffix $(PPUEXT),$(TARGET_UNITS))'#010+ + 'override UNITPPUFI','LES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)',#010+ + 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNIT','PPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ @@ -1858,24 +1859,24 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Exes'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_exes'#010+ - #010, + '.PHONY: f','pc_exes'#010+ + #010+ '# Programs are not needed for a cross installation'#010+ 'ifndef CROSSINSTALL'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffi'+ - 'x $(LTOEXT)',',$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(adds'+ + 'x ','$(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(adds'+ 'uffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREF'+ 'IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ - 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROG','RAMS))'#010+ + 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TA','RGET_PROGRAMS))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(T','ARGET_PROGRAMS))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOU','TEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1887,7 +1888,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '########################','############################################'+ + '###############','#####################################################'+ '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ @@ -1895,7 +1896,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRSTFILES+=$(RST','FILES)'#010+ + 'override CLEANRSTFIL','ES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ @@ -1906,22 +1907,22 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifneq ($(TARGET_EXAMPLES),)'#010+ - 'HASEXAMP','LES=1'#010+ + 'ifneq ($(TARGET_EXAMPLES),)',#010+ + 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPL'+ 'ES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EX'+ 'AMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(','TARGET_EXAMPLES))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(E','XEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(adds'+ 'uffix $(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(a'+ 'ddsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIBP'+ - 'REFIX),$(add','suffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ + 'REF','IX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ #010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ - 'ifeq ($(OS_TARGET),os','2)'#010+ + 'ifeq ($(OS_T','ARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ @@ -1931,15 +1932,15 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ 'HASEXAMPLES=1'#010+ 'endif'#010+ - #010+ - 'fpc_examp','les: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ - 'IRS))'#010+ + #010, + 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ + 'S))'#010+ #010+ #010+ '[compilerules]'#010+ '#####################################################################'#010+ '# General compile rules'#010+ - '################################################################','####'+ + '#######################################################','#############'+ '#'#010+ #010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ @@ -1950,9 +1951,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'fpc_all: $(FPCMADE)'#010+ #010+ 'fpc_smart:'#010+ - ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ + ' $(MAKE) all LINKSMART=1 CREATESMART','=1'#010+ #010+ - 'fpc_d','ebug:'#010+ + 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ @@ -1962,9 +1963,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'nsions'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+ - 'c .res'#010+ + 'c .r','es'#010+ #010+ - '$(COM','PILER_UNITTARGETDIR):'#010+ + '$(COMPILER_UNITTARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ @@ -1975,8 +1976,8 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ - ' $(COMPILER) $<'#010+ - ' ',' $(EXECPPAS)'#010+ + ' $(COMPI','LER) $<'#010+ + ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ @@ -1991,7 +1992,7 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.dpr'#010+ - ' $(COMPILE','R) $<'#010+ + ' ','$(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%.res: %.rc'#010+ @@ -2000,12 +2001,12 @@ const fpcmakeini : array[0..268,1..240] of char=( '# 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+ + 'vpa','th %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+ - 'vpath %$(PPUEXT) $(','COMPILER_UNITTARGETDIR)'#010+ + 'vpath %$(P','PUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ @@ -2014,7 +2015,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '.PHONY: fpc_shared'#010+ #010+ - 'override INSTALLTARGET+=fpc_sh','ared_install'#010+ + 'override INSTALLTARGE','T+=fpc_shared_install'#010+ #010+ 'ifndef SHARED_LIBVERSION'#010+ 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ @@ -2025,8 +2026,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'ifndef SHARED_FULLNAME'#010+ - 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ - 'N)$(SHAR','EDLIBEXT)'#010+ + 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSI', + 'ON)$(SHAREDLIBEXT)'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ @@ -2035,13 +2036,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ 'endif'#010+ - #010+ - 'fpc_share','d:'#010+ + #010, + 'fpc_shared:'#010+ 'ifdef HASSHAREDLIB'#010+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+ - 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILS','PREFIX)'#010+ + 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$','(BINUTILSPREFIX)'#010+ 'endif'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ @@ -2051,7 +2052,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifneq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ - ' $(INSTALL) $(COMPI','LER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+ + ' $(INSTALL',') $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+ 'STALL_SHAREDDIR)'#010+ 'endif'#010+ 'endif'#010+ @@ -2060,7 +2061,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '[installrules]'#010+ '#####################################################################'#010+ '# Install rules'#010+ - '#############################################################','#######'+ + '####################################################','################'+ '#'#010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ @@ -2070,38 +2071,38 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ - 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDU','NIT)$(PPUEXT)'+ + 'override INSTALLPPUFILES:=$(filter-out $(INSTA','LL_BUILDUNIT)$(PPUEXT)'+ ',$(INSTALLPPUFILES))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ '# Avoid getting the same name twice as some install EXE fail'#010+ '# in this case, happends for instance for OS/2 target'#010+ - 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$','(STATI'+ + 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIB','PREFIX)-$(STATI'+ 'CLIBEXT))'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+ 'ATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) '+ - '$(addprefix $(','IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ + '$(add','prefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ 'NSTALLPPUFILES)))'#010+ 'else'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+ - 'ATICLIBPREFIX),$(subst ','$(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ + 'ATICLIBPREFIX)',',$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ ')'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ 'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+ 'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+ - 'override INSTALLPPUFILES=$(a','ddprefix $(UNITTARGETDIRPREFIX),$(INSTAL'+ + 'override INSTALLPPU','FILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTAL'+ 'LPPUFILENAMES))'#010+ 'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+ 'FIX),$(INSTALLPPULINKFILENAMES)))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ - 'override INSTALL_CREATEPACKAGEFPC=1'#010+ - 'endif',#010+ + 'override INSTALL_CREATEPACKAGEFP','C=1'#010+ + 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ @@ -2112,14 +2113,14 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' $(MKDIR) $(INSTALL_BINDI','R)'#010+ + ' $(MKDIR) $(INST','ALL_BINDIR)'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ - '# a safety check is done if Makefile.fpc is available'#010, + '# a safety check is done if Makefile.fpc is a','vailable'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ @@ -2129,13 +2130,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INST','ALLPPUFILES'#010+ + 'i','fdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB_FULLNAME)),)',#010+ + 'ifneq ($(wildcard $(LIB_FUL','LNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ @@ -2144,15 +2145,15 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FILES'#010+ - ' $(MKDIR) $(INSTALL_DATADIR)'#010+ - ' ',' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ + ' $(MKDIR) $(INSTALL_DAT','ADIR)'#010+ + ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _di','stclean,$'+ + 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(adds','uffix _distclean,$'+ '(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ @@ -2161,16 +2162,16 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffi','x /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ + ' $(COPYTREE) $','(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ '#####################################################################'#010+ '# Dist Install'#010+ - '#####################################################################'#010+ + '#####################################################################'#010, #010+ - '.PHONY: ','fpc_distinstall'#010+ + '.PHONY: fpc_distinstall'#010+ #010+ 'fpc_distinstall: install exampleinstall'#010+ #010+ @@ -2180,14 +2181,14 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipi','nstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ + '.PHONY:',' fpc_zipinstall fpc_zipsourceinstall 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+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ - 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ - 'else',#010+ + 'PACKDIR=$(BASEDIR)/../fpc-','pack'#010+ + 'else'#010+ 'PACKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ 'endif'#010+ @@ -2202,7 +2203,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPRE','FIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ + 'FULLZIPNAME=$(ZIPCROSSPREFIX',')$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ @@ -2221,7 +2222,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Use a wrapp','er script by default for Os/2'#010+ + '# Us','e a wrapper script by default for Os/2'#010+ 'ifndef inUnix'#010+ 'USEZIPWRAPPER=1'#010+ 'endif'#010+ @@ -2230,7 +2231,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(S','RCBATCHEXT)'+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/','fpczip$(SRCBATCHEXT)'+ ')'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ @@ -2240,7 +2241,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZ','IPNAME)$(TAREXT)'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR',')/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ @@ -2249,20 +2250,20 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ - ' $(M','AKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ + ' ',' $(MAKE) $(ZIPTARGET) INSTALL_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+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ - ' echo $(ZIPCMD_CDPACK) > $(ZI','PWRAPPER)'#010+ + ' echo $(ZIPCMD_CDPAC','K) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ @@ -2272,9 +2273,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef RUNBATCH'#010+ ' $(RUNBATCH) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPWRAPPER)'#010+ + ' $(ZIPWRAPPER)'#010, + 'endif'#010+ 'endif'#010+ - 'end','if'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ @@ -2283,7 +2284,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ - 'SOURCESUFFIX)'#010, + 'SOURC','ESUFFIX)'#010+ #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ @@ -2296,7 +2297,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[cleanrules]'#010+ - '#################','###################################################'+ + '########','############################################################'+ '#'#010+ '# Clean rules'#010+ '#####################################################################'#010+ @@ -2304,7 +2305,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(addprefix $(TAR','GETDIRPREFIX),$(CLEANEXEFIL'+ + 'override CLEANEXEFILES:=$(addpre','fix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ 'ES))'#010+ 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ 'GFILES))'#010+ @@ -2312,9 +2313,9 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'ifdef CLEAN_PROGRAMS'#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ - 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ - 'ove','rride CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffi'+ - 'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ + 'XEEXT), $(CLEAN_PROGRA','MS)))'#010+ + 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ + '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ @@ -2322,18 +2323,18 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILE','S:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'override CLEANPP','ULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ 'S)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATIC'+ 'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+ - 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT','),$(CLEANPP'+ + 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STA','TICLIBEXT),$(CLEANPP'+ 'UFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'UFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+ - 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+ - 'L','ENAMES))'#010+ + 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CL','EANPPU'+ + 'FILENAMES))'#010+ 'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+ 'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+ 'X),$(CLEANPPULINKFILENAMES)))'#010+ @@ -2341,7 +2342,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(CLEANEX','EFILES)'#010+ + ' -$(DEL) ','$(CLEANEXEFILES)'#010+ 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ 'ifdef CLEANEXEDBGFILES'#010+ @@ -2350,8 +2351,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' ',' -$(DEL) $(CLEANPPULINKFILES)'#010+ + 'ifneq ($(CLEANPPULINKF','ILES),)'#010+ + ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -2360,12 +2361,12 @@ const fpcmakeini : array[0..268,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NAME) $(LIB','_FULLNAME)'#010+ + ' -$(DEL) $(LIB_NA','ME) $(LIB_FULLNAME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+ ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+ 'ipt.res *_link.res'#010+ - ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppasli','nk$('+ + ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEX','T) ppaslink$('+ 'BATCHEXT)'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET)'#010+ @@ -2377,7 +2378,7 @@ const fpcmakeini : array[0..268,1..240] of char=( ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$(DEL) $(C','LEANPPULINKFILES)'#010+ + ' -$','(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -2388,13 +2389,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ ' -$(DELTREE) units'#010+ ' -$(DELTREE) bin'#010+ - ' -$','(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT)'+ + ' ',' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT)'+ ' *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) fpcmade.* Package.fpc *.fpm'#010, + ' -$(DEL) fpcmade.* Package.f','pc *.fpm'#010+ ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+ 'ipt.res *_link.res'#010+ ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ @@ -2402,8 +2403,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ - 'ifdef DEBUGSYMEXT'#010+ - ' ',' -$(DEL) *$(DEBUGSYMEXT)'#010+ + 'ifdef DEBUGSYMEX','T'#010+ + ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ 'ifdef LOCALFPMAKEBIN'#010+ ' -$(DEL) $(LOCALFPMAKEBIN)'#010+ @@ -2414,8 +2415,9 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '#####################################################################'#010+ - '# B','ase info rules'#010+ + '################################################################','####'+ + '#'#010+ + '# Base info rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ @@ -2425,37 +2427,37 @@ const fpcmakeini : array[0..268,1..240] of char=( 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ - ' @$(ECHO) Package Name','..... $(PACKAGE_NAME)'#010+ + ' @$(ECHO) Pac','kage Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+ - ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010, + ' @$(ECHO) FPC Version.. $(FPC_','VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ - ' @$(','ECHO) Full Target.. $(FULL_TARGET)'#010+ + ' ',' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Directory info =='#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO) == Directory info =','='#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ - ' @$(ECHO) ',' UnitsDir........ $(UNITSDIR)'#010+ + ' ','@$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Tools i','nfo =='#010+ + ' @$(ECHO) =','= Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ @@ -2463,54 +2465,54 @@ const fpcmakeini : array[0..268,1..240] of char=( ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ - ' @$(ECHO) Cp','........ $(CPPROG)'#010+ + ' @$(','ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ - ' @$(ECHO) FPCMake... ','$(FPCMAKE)'#010+ + ' @$(ECHO) FP','CMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ - ' @$(ECHO) Ta','rget Units.......... $(TARGET_UNITS)'#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) Targ','et Examples....... $(TARGET_EXAMPLES)'#010+ + ' @$(EC','HO) Target Examples....... $(TARGET_EXAMPLES)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ - ' @$(ECH','O)'#010+ + ' ',' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' ',' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ + ' @$(ECHO) DateStr.............. $(DAT','ESTR)'#010+ + ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) FullZipNam','e.......... $(FULLZIPNAME)'#010+ + ' @$(ECHO) F','ullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ - ' @$(ECHO) ',' Install library dir.. $(INSTALL_LIBDIR)'#010+ + ' ','@$(ECHO) Install 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) Ins','tall example dir.. $(INSTALL_EXAMPLEDIR)'#010+ + ' @$(E','CHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ - ' @$(','ECHO)'#010+ + ' ',' @$(ECHO)'#010+ #010+ '[inforules]'#010+ '#####################################################################'#010+ @@ -2521,15 +2523,14 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_info: $(INFORULES)'#010+ #010+ - '[makefilerules]'#010+ - '#########','###########################################################'+ - '#'#010+ + '[makefilerules]'#010, + '#####################################################################'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ ' \'#010+ - ' fpc_make','file_dirs'#010+ + ' ',' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ @@ -2540,7 +2541,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(FPCMAKE',') -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ + ' ','$(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ 'GET_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ @@ -2549,15 +2550,15 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ - 'fpc_makefiles: fpc_make','file fpc_makefile_dirs'#010+ + 'fpc_makefiles:',' fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ #010+ - 'ifneq ($(wildcard fpcmake.loc),)'#010+ - 'include f','pcmake.loc'#010+ + 'ifneq ($(wildcard fpcmake.loc),)'#010, + 'include fpcmake.loc'#010+ 'endif'#010+ #010+ #010+ @@ -2567,7 +2568,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '###########################################','#########################'+ + '##################################','##################################'+ '#'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ @@ -2578,8 +2579,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'LCL_PLATFORM=win32'#010+ 'else'#010+ 'LCL_PLATFORM=gtk'#010+ + 'e','ndif'#010+ 'endif'#010+ - 'endi','f'#010+ 'export LCL_PLATFORM'#010+ #010+ '# Check if the specified LCLDIR is correct'#010+ @@ -2590,9 +2591,9 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'else'#010+ 'override LCLDIR=wrong'#010+ - 'endif'#010+ + 'endif',#010+ #010+ - '# Check',' if the default LCLDIR is correct'#010+ + '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ @@ -2601,7 +2602,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Check for development version'#010+ - 'ifeq ($(LCLDIR),wr','ong)'#010+ + 'ifeq ($(L','CLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ @@ -2610,7 +2611,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Check for release version'#010+ - 'ifeq ($(LCLDIR),wr','ong)'#010+ + 'ifeq ($(L','CLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ @@ -2619,21 +2620,22 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR=$(wildca','rd $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL'+ + 'override LCLUNITDIR','=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL'+ 'DIR)/units)'#010+ 'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../componen'+ 'ts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQUIRE_PACKAGESDI','R+=$(LCLCOMPONENTDIR)'#010+ + 'override REQUIRE_P','ACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '#####################################################################'#010+ - 'over','ride INFORULES+=lclinfo'#010+ + '#################################################################','###'+ + '#'#010+ + 'override INFORULES+=lclinfo'#010+ #010+ '.PHONY: lclinfo'#010+ #010+ @@ -2642,14 +2644,14 @@ const fpcmakeini : array[0..268,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO) LCL Unit dir...','...... $(LCLUNITDIR)'#010+ + ' @$(ECHO) LCL Un','it dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010+ #010+ '[fpmakeprerules]'#010+ '#####################################################################'#010+ '# fpmake prerules'#010+ - '#####################################','###############################'+ + '############################','########################################'+ '#'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ 'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+ @@ -2657,7 +2659,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ 'd --cpu parameters'#010+ - 'ifdef OS_T','ARGET'#010+ + 'i','fdef OS_TARGET'#010+ 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ 'endif'#010+ 'ifdef CPU_TARGET'#010+ @@ -2668,12 +2670,12 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Get the location of the bootstrap-fpmkunit units'#010+ - 'PACKAGEDIR_FPMKUNIT:=','$(firstword $(subst /Makefile.fpc,,$(strip $(wi'+ + 'PACKAGEDIR_F','PMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wi'+ 'ldcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ ')'#010+ - 'override COMPILER_FPMAKE_UN','ITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#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+ @@ -2682,20 +2684,20 @@ const fpcmakeini : array[0..268,1..240] of char=( 'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+ 'endif'#010+ #010+ - '[fpmakerules]'#010, + '[fpma','kerules]'#010+ '#####################################################################'#010+ '# fpmake rules'#010+ '#####################################################################'#010+ '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+ - 'pleinstall'#010+ + 'pleins','tall'#010+ #010+ - '# D','o not pass the Makefile'#039's unit and binary target locations. f'+ - 'pmake uses it'#039's own.'#010+ + '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+ + 'ake uses it'#039's own.'#010+ 'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+ 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+ '# Compose general fpmake-parameters'#010+ 'ifdef FPMAKEOPT'#010+ - 'FPMAKE_OPT+=$(','FPMAKEOPT)'#010+ + 'FPMAK','E_OPT+=$(FPMAKEOPT)'#010+ 'endif'#010+ 'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+ 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+ @@ -2703,8 +2705,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+ 'FPMAKE_OPT+=--compiler=$(FPC)'#010+ 'FPMAKE_OPT+=-bu'#010+ - 'ifdef FPC_DOTTEDUNITS'#010+ - 'FPM','AKE_OPT+=-ns'#010+ + 'ifdef FPC_DOTTED','UNITS'#010+ + 'FPMAKE_OPT+=-ns'#010+ 'endif'#010+ #010+ 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ @@ -2713,14 +2715,14 @@ const fpcmakeini : array[0..268,1..240] of char=( 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+ 'ON)'#010+ 'else'#010+ - 'FPMAKE_INSTALL_OPT+=--p','refix=$(INSTALL_BASEDIR)'#010+ + 'FPMAKE_INSTALL','_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ 'override ALLTARGET+=fpc_fpmake'#010+ 'override INSTALLTARGET+=fpc_fpmake_install'#010+ 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+ - '# If no fpmake exists and (dist)clean is called, do not try to build f'+ - 'pmake, ','it will'#010+ + '# 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+ 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+ @@ -2728,29 +2730,29 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ - ' $(MAKE',') -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix '+ + ' ',' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix '+ 'OPT=,$(FPMAKE_BUILD_OPT))'#010+ #010+ '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+ ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+ 'IR)) $(FPMAKE_BUILD_OPT)'#010+ #010+ - 'fpc_fpmake: $(FPMAKEBIN)'#010+ - ' ',' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ + 'fpc_fpmake: $(FPMA','KEBIN)'#010+ + ' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_install: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+ - 'PT)'#010, + ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INST','ALL'+ + '_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+ - 'fpc_fpmake_example','install: $(FPMAKEBIN)'#010+ + 'fpc_fpmak','e_exampleinstall: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ 'LL_OPT)'#010 ); diff --git a/utils/fpcm/fpmake.pp b/utils/fpcm/fpmake.pp index 94bfefb8c7..ac4df1e8de 100644 --- a/utils/fpcm/fpmake.pp +++ b/utils/fpcm/fpmake.pp @@ -204,7 +204,7 @@ begin begin P:=AddPackage('utils-fpcm'); P.ShortName:='fpcm'; - P.OSes:=AllOSes-[embedded,msdos,nativent,win16,macosclassic,atari,palmos,human68k,zxspectrum,msxdos,amstradcpc,sinclairql]; + P.OSes:=AllOSes-[embedded,msdos,nativent,win16,macosclassic,atari,palmos,zxspectrum,msxdos,amstradcpc,sinclairql,human68k]; if Defaults.CPU=jvm then P.OSes := P.OSes - [java,android]; diff --git a/utils/fpcm/revision.inc b/utils/fpcm/revision.inc index 08807581d7..416b1d8f5c 100644 --- a/utils/fpcm/revision.inc +++ b/utils/fpcm/revision.inc @@ -1 +1 @@ -'2023-09-25 hash 1d4d71b5a0' +'2023-11-21 hash cb1c31fd34'