From c9ee52a8f59bb5b870ffdc1563a95dc71dbc8a67 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Thu, 25 Nov 2021 21:42:17 +0000 Subject: [PATCH] Regenerated fpcmake.inc after previous commit: Use filter instead of findstring make function when a whole word needs to match --- utils/fpcm/fpcmake.inc | 1099 ++++++++++++++++++++-------------------- 1 file changed, 550 insertions(+), 549 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index b56b9e6c05..dddde80297 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..259] of string[240]=( +const fpcmakeini : array[0..258] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..259,1..240] of char=( +const fpcmakeini : array[0..258,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -103,12 +103,12 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ 'ifdef COMSPEC'#010+ - 'ifneq ($(findstring $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)'#010+ + 'ifneq ($(filter $(OS_SOURCE),$(OSNeedsComspecToRunBatch)),)'#010+ 'ifndef RUNBATCH'#010+ 'RUNBATCH=$(COMSPEC) /C'#010+ 'endif'#010+ - 'endi','f'#010+ 'endif'#010+ + 'en','dif'#010+ #010+ '# Path Separator, the subst trick is necessary for the \ that can'#039't'+ ' exists'#010+ @@ -121,16 +121,16 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ifdef inCygWin'#010+ 'PATHSEP=/'#010+ 'endif'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ - '# Base dir'#010+ + '#',' Base dir'#010+ 'ifdef PWD'#010+ 'BASEDIR:=$(subst \,/,$(shell $(PWD)))'#010+ '# For Cygwin we need to replace /cygdrive/c/ with c:/'#010+ 'ifdef inCygWin'#010+ 'ifneq ($(findstring /cygdrive/,$(BASEDIR)),)'#010+ 'BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))'#010+ - 'BASEDRIVE:=$(firs','tword $(subst /, ,$(BASENODIR)))'#010+ + 'BASEDRIVE:=$(firstwor','d $(subst /, ,$(BASENODIR)))'#010+ 'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))'#010+ 'endif'#010+ 'endif'#010+ @@ -142,7 +142,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ays found'#010+ 'ifdef inOS2'#010+ 'ifndef ECHO'#010+ - 'ECHO:','=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH'+ + 'ECHO:=$(s','trip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH'+ '))))'#010+ 'ifeq ($(ECHO),)'#010+ 'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))'+ @@ -153,7 +153,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ECHO:=$(firstword $(ECHO))'#010+ 'endif'#010+ 'else'#010+ - 'ECHO:=$(firstwo','rd $(ECHO))'#010+ + 'ECHO:=$(firstword $','(ECHO))'#010+ 'endif'#010+ 'endif'#010+ 'export ECHO'#010+ @@ -164,7 +164,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '# FPC Binary and Version Detection'#010+ '#####################################################################'#010+ #010+ - '# Compati','bility with old makefiles'#010+ + '# Compatibili','ty with old makefiles'#010+ 'ifndef FPC'#010+ 'ifdef PP'#010+ 'FPC=$(PP)'#010+ @@ -173,7 +173,7 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '# Try to detect the ppcXXX file to use by using "fpc -PB" option'#010+ '# to query for the default ppcXXX the fpc executable tries. When'#010+ - '# fpc is not found use ppc386 by default.',' Also when fpc -PB gives'#010+ + '# fpc is not found use ppc386 by default. Als','o when fpc -PB gives'#010+ '# an error ppc386 will be used.'#010+ 'ifndef FPC'#010+ '# check if fpc exists'#010+ @@ -181,15 +181,15 @@ const fpcmakeini : array[0..259,1..240] of char=( ')))'#010+ 'ifneq ($(FPCPROG),)'#010+ 'FPCPROG:=$(firstword $(FPCPROG))'#010+ - 'ifneq ($(CPU_TARGET),)'#010, - 'FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)'#010+ + 'ifneq ($(CPU_TARGET),)'#010+ + 'FPC:','=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB)'#010+ 'else'#010+ 'FPC:=$(shell $(FPCPROG) -PB)'#010+ 'endif'#010+ '# Older fpc executables didn'#039't support it and return'#010+ '# Error: Illegal processor... If found then fallback to ppc386'#010+ 'ifneq ($(findstring Error,$(FPC)),)'#010+ - 'ove','rride FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRC'+ + 'overrid','e FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRC'+ 'EXEEXT),$(SEARCHPATH)))))'#010+ 'else'#010+ '# if the cross compiler is not found, fall back to fpc'#010+ @@ -198,7 +198,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ 'else'#010+ - '# fpc b','inary not found, fallback to ppc386'#010+ + '# fpc binar','y not found, fallback to ppc386'#010+ 'override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEX'+ 'EEXT),$(SEARCHPATH)))))'#010+ 'endif'#010+ @@ -206,14 +206,14 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '# Get a clean executable name'#010+ 'override FPC:=$(subst $(SRCEXEEXT),,$(FPC))'#010+ - 'override FPC:=$(subst \',',/,$(FPC))$(SRCEXEEXT)'#010+ + 'override FPC:=$(subst \,/,$','(FPC))$(SRCEXEEXT)'#010+ #010+ '# Try to find the binary direct first, otherwise in the path,'#010+ '# if not found give an error'#010+ 'FOUNDFPC:=$(strip $(wildcard $(FPC)))'#010+ 'ifeq ($(FOUNDFPC),)'#010+ 'FOUNDFPC=$(strip $(wildcard $(addsuffix /$(FPC),$(SEARCHPATH))))'#010+ - 'if','eq ($(FOUNDFPC),)'#010+ + 'ifeq (','$(FOUNDFPC),)'#010+ '$(error Compiler $(FPC) not found)'#010+ 'endif'#010+ 'endif'#010+ @@ -224,7 +224,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#010+ 'endif'#010+ #010+ - '# FPC ver','sion'#010+ + '# FPC version',#010+ 'ifndef FPC_VERSION'#010+ 'FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ @@ -234,7 +234,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '# This should limit multiple checks'#010+ 'unexport CHECKDEPEND ALLDEPENDENCIES'#010+ #010+ - '###############','#####################################################'+ + '###################','#################################################'+ '#'#010+ '# FPC Target Detection'#010+ '#####################################################################'#010+ @@ -242,7 +242,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '# Fall back to default values if needed'#010+ 'ifndef CPU_TARGET'#010+ 'ifdef CPU_TARGET_DEFAULT'#010+ - 'CPU_TARG','ET=$(CPU_TARGET_DEFAULT)'#010+ + 'CPU_TARGET=$','(CPU_TARGET_DEFAULT)'#010+ 'endif'#010+ 'endif'#010+ 'ifndef OS_TARGET'#010+ @@ -255,7 +255,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ifndef CPU_SOURCE'#010+ 'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ - 'if','ndef CPU_TARGET'#010+ + 'ifndef',' CPU_TARGET'#010+ 'CPU_TARGET:=$(word 3,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ 'ifndef OS_SOURCE'#010+ @@ -265,7 +265,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ 'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'FULL_SOUR','CE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ + 'FULL_SOURCE=$','(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifeq ($(CPU_TARGET),armeb)'#010+ 'ARCH=arm'#010+ @@ -280,7 +280,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ 'ifeq ($(FULL_TARGET),arm-embedded)'#010+ - 'ifeq ($(SUBARC','H),)'#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'+ @@ -289,13 +289,13 @@ const fpcmakeini : array[0..259,1..240] of char=( 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ - 'if','eq ($(FULL_TARGET),avr-embedded)'#010+ + 'ifeq (','$(FULL_TARGET),avr-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 avr-embedded, a sub-architecture (e.g. SUBA'+ 'RCH=avr25 or SUBARCH=avr35) must be defined)'#010+ - 'e','ndif'#010+ + 'endif',#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ @@ -303,8 +303,8 @@ const fpcmakeini : array[0..259,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 sub-architecture (e.g.',' '+ - 'SUBARCH=pic32mx) must be defined)'#010+ + '$(error When compiling for mipsel-embedded, a sub-architecture (e.g. S'+ + 'UB','ARCH=pic32mx) must be defined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ @@ -312,7 +312,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ifeq ($(FULL_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+ + 'UBARCH=lx106 or SUBARCH=lx6) must be d','efined)'#010+ 'endif'#010+ 'override FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ @@ -322,7 +322,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '$(error When compiling for xtensa-freertos, a sub-architecture (e.g. S'+ 'UBARCH=lx106 or SUBARCH=lx6) must be defined)'#010+ 'endif'#010+ - 'overr','ide FPCOPT+=-Cp$(SUBARCH)'#010+ + 'override ','FPCOPT+=-Cp$(SUBARCH)'#010+ 'endif'#010+ #010+ 'ifeq ($(FULL_TARGET),arm-freertos)'#010+ @@ -330,16 +330,16 @@ const fpcmakeini : array[0..259,1..240] of char=( '$(error When compiling for arm-freertos, a sub-architecture (e.g. SUBA'+ 'RCH=armv6m or SUBARCH=armv7em) must be defined)'#010+ 'endif'#010+ - 'override FPCOPT+=-Cp$(SUBARCH',')'#010+ - 'endif'#010+ + 'override FPCOPT+=-Cp$(SUBARCH)'#010+ + 'en','dif'#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 ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ + 'ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)'#010+ 'TARGETSUFFIX=$(OS_TARGET)'#010+ 'SOURCESUFFIX=$(OS_SOURCE)'#010+ 'else'#010+ - 'ifneq ($(findstring $(OS_','TARGET),$(LIMIT83fs)),)'#010+ + 'ifneq ($(filter $(OS_TARGET),$(LI','MIT83fs)),)'#010+ 'TARGETSUFFIX=$(OS_TARGET)'#010+ 'else'#010+ 'TARGETSUFFIX=$(FULL_TARGET)'#010+ @@ -352,25 +352,25 @@ const fpcmakeini : array[0..259,1..240] of char=( 'CROSSCOMPILE=1'#010+ 'endif'#010+ #010+ - '# Check if the Makefile supports th','is target, but not'#010+ + '# Check if the Makefile supports this target, b','ut not'#010+ '# when the make target is to rebuild the makefile'#010+ 'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+ - 'ifeq ($(findstring $(FULL_TARGET),$(MAKEFILETARGETS)),)'#010+ + 'ifeq ($(filter $(FULL_TARGET),$(MAKEFILETARGETS)),)'#010+ '$(error The Makefile doesn'#039't support target $(FULL_TARGET), please'+ - ' r','un fpcmake first)'#010+ + ' run fpcmake first',')'#010+ 'endif'#010+ 'endif'#010+ #010+ #010+ '# Detect BSD, since BSD uses a slightly different directory hierarchy.'+ #010+ - 'ifneq ($(findstring $(OS_TARGET),$(BSDs)),)'#010+ + 'ifneq ($(filter $(OS_TARGET),$(BSDs)),)'#010+ 'BSDhier=1'#010+ 'endif'#010+ #010+ '# Detect Linux, will also use its own directory hierarchy.'#010+ - 'ifeq ($(OS_TARGET','),linux)'#010+ - 'linuxHier=1'#010+ + 'ifeq ($(OS_TARGET),linux)'#010+ + 'linuxHier=1',#010+ 'endif'#010+ #010+ 'ifndef CROSSCOMPILE'#010+ @@ -384,13 +384,13 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ 'export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL'+ - '_SOURCE TARG','ETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+ + '_SOURCE TARGETSUFFIX SOURCESUFFI','X CROSSCOMPILE'#010+ #010+ '[fpmakefpcdetect]'#010+ '#####################################################################'#010+ '# FPC Binary and Version Detection'#010+ '#####################################################################'#010+ - '# If FPCFPM','AKE is not set and we'#039're cross-compiling, try to find'+ + '# If FPCFPMAKE is not set and w','e'#039're cross-compiling, try to find'+ ' a'#010+ '# native compiler.'#010+ 'ifndef FPCFPMAKE'#010+ @@ -400,37 +400,37 @@ const fpcmakeini : array[0..259,1..240] of char=( 'build'#010+ '# of the native rtl'#010+ #010+ - 'ifeq ($(strip $(wildcard $(adds','uffix /compiler/ppc$(SRCEXEEXT),$(FPC'+ + 'ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$','(SRCEXEEXT),$(FPC'+ 'DIR)))),)'#010+ '# If that compiler is not found, use the common, installed native comp'+ 'iler'#010+ '# Note that in this case FPCFPMAKE is not exported, because it could b'+ 'e that'#010+ - '# a more suitable compiler is compiled la','ter on'#010+ - '# check if fpc exists'#010+ + '# a more suitable compiler is compiled later on'#010+ + '# check if fp','c exists'#010+ 'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#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+ - 'ifeq ($(strip $(wildcard $(FPCFPMAKE))),)'#010+ + '# if a native compiler is not found, fall back to fpc'#010+ + 'ifeq ($(strip $','(wildcard $(FPCFPMAKE))),)'#010+ 'FPCFPMAKE:=$(firstword $(FPCPROG))'#010+ 'endif'#010+ 'else'#010+ '# fpc binary not found, fallback to ppc386'#010+ 'override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$'+ '(SRCEXEEXT),$(SEARCHPATH)))))'#010+ - 'endi','f'#010+ + 'endif'#010+ 'else'#010+ - '# Use the ppc compiler. Because the path to the compiler is relative, '+ - 'do not'#010+ + '# Use the ppc',' compiler. Because the path to the compiler is relative'+ + ', do not'#010+ '# evaluate the variable here, but do that on the fly.'#010+ 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(F'+ 'PCDIR))))'#010+ - 'FPMAKE_SKIP_CONFIG=-n'#010, + 'FPMAKE_SKIP_CONFIG=-n'#010+ 'export FPCFPMAKE'#010+ - 'export FPMAKE_SKIP_CONFIG'#010+ + 'exp','ort FPMAKE_SKIP_CONFIG'#010+ 'endif'#010+ #010+ 'else'#010+ @@ -444,7 +444,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '[fpcdircheckenv]'#010+ '#####################################################################'#010+ '# FPCDIR Setting'#010+ - '###########################','#########################################'+ + '###############################################','#####################'+ '#'#010+ #010+ '# Test FPCDIR to look if the RTL dir exists'#010+ @@ -454,10 +454,10 @@ const fpcmakeini : array[0..259,1..240] of char=( 'override FPCDIR=wrong'#010+ 'endif'#010+ 'else'#010+ - 'override FPCDIR=wr','ong'#010+ + 'override FPCDIR=wrong'#010+ 'endif'#010+ #010+ - '# Default FPCDIR from Makefile.fpc'#010+ + '# Default',' FPCDIR from Makefile.fpc'#010+ 'ifdef DEFAULT_FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ 'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+ @@ -467,23 +467,23 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '[fpcdirdetect',']'#010+ + '[fpcdirdetect]'#010+ '# Detect FPCDIR'#010+ - 'ifeq ($(FPCDIR),wrong)'#010+ + 'if','eq ($(FPCDIR),wrong)'#010+ 'ifdef inUnix'#010+ 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ - 'override FPCDIR:=$(subst /$(FPC),,$(firstword',' $(strip $(wildcard $(a'+ + 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard ','$(a'+ 'ddsuffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ - 'override FPCDIR:=$(BASEDI','R)'#010+ - 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl)),)'#010+ + 'override FPCDIR:=$(BASEDIR)'#010+ + 'ifeq ($(wildcard ','$(addprefix $(FPCDIR)/,rtl)),)'#010+ 'override FPCDIR=c:/pp'#010+ 'endif'#010+ 'endif'#010+ @@ -496,18 +496,18 @@ const fpcmakeini : array[0..259,1..240] of char=( 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+ 'endif'#010+ #010+ - '# Default binutils prefix for cros','s compile when the'#010+ - '# crossbindir is not set (except for Darwin)'#010+ - 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)'#010+ - 'ifneq ($(findstring $(OS_SOURCE),darwin ios),)'#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+ + 'ifneq ($(filter $(OS_SOURCE),darwin ios),)'#010+ 'DARWIN2DARWIN=1'#010+ 'endif'#010+ 'endif'#010+ #010+ 'ifndef BINUTILSPREFIX'#010+ 'ifndef CROSSBINDIR'#010+ - 'if','def CROSSCOMPILE'#010+ - 'ifneq ($(OS_TARGET),msdos)'#010+ + 'ifdef CROSSCOMPILE'#010+ + 'ifneq ($(OS','_TARGET),msdos)'#010+ 'ifndef DARWIN2DARWIN'#010+ 'ifneq ($(CPU_TARGET),jvm)'#010+ 'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+ @@ -515,8 +515,8 @@ const fpcmakeini : array[0..259,1..240] of char=( '# For Android use standard NDK prefixes'#010+ 'ifeq ($(OS_TARGET),android)'#010+ 'ifeq ($(CPU_TARGET),arm)'#010+ - 'BINUTILSPREF','IX=arm-linux-androideabi-'#010+ - 'else'#010+ + 'BINUTILSPREFIX=arm-linux-androideabi-'#010+ + 'el','se'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'BINUTILSPREFIX=i686-linux-android-'#010+ 'else'#010+ @@ -534,7 +534,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Try fir','st the full target name, otherwise try only'#010+ + '# Try first the full target name, oth','erwise try only'#010+ '# the OS for backwards compatibility'#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+ 'ifeq ($(UNITSDIR),)'#010+ @@ -542,7 +542,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Packages dir'#010+ - 'PACKAGESDIR:','=$(wildcard $(FPCDIR) $(FPCDIR)/packages)'#010+ + 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCD','IR)/packages)'#010+ #010+ #010+ '[shelltools]'#010+ @@ -550,7 +550,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '# Shell tools'#010+ '#####################################################################'#010+ #010+ - '# Echo that can redir (must ','be able run in the default OS shell)'#010+ + '# Echo that can redir (must be able run in the default O','S shell)'#010+ 'ifndef ECHOREDIR'#010+ 'ifndef inUnix'#010+ 'ECHOREDIR=echo'#010+ @@ -567,10 +567,10 @@ const fpcmakeini : array[0..259,1..240] of char=( '# Copy a whole tree'#010+ 'ifndef COPYTREE'#010+ 'COPYTREE:=$(CPPROG) -Rfp'#010+ - 'end','if'#010+ + 'endif'#010+ #010+ '# Copy a whole tree'#010+ - 'ifndef MKDIRTREE'#010+ + 'ifnd','ef MKDIRTREE'#010+ 'MKDIRTREE:=$(MKDIRPROG) -p'#010+ 'endif'#010+ #010+ @@ -586,10 +586,10 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '# Check deltree program'#010+ 'ifndef DELTREE'#010+ - 'DELTREE:=$(','RMPROG) -rf'#010+ + 'DELTREE:=$(RMPROG) -rf'#010+ 'endif'#010+ #010+ - '# To install files'#010+ + '# To inst','all files'#010+ 'ifndef INSTALL'#010+ 'ifdef inUnix'#010+ 'INSTALL:=$(GINSTALL) -c -m 644'#010+ @@ -603,11 +603,11 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ifdef inUnix'#010+ 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ 'else'#010+ - 'INSTALLEXE:=$(CO','PY)'#010+ + 'INSTALLEXE:=$(COPY)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# To make a directory.'#010+ + '# To make a',' directory.'#010+ 'ifndef MKDIR'#010+ 'MKDIR:=$(GINSTALL) -m 755 -d'#010+ 'endif'#010+ @@ -617,9 +617,8 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ #010+ '[defaultdirs]'#010+ - '##############################################################','######'+ - '#'#010+ - '# Default Directories'#010+ + '#####################################################################'#010+ + '# Default Directorie','s'#010+ '#####################################################################'#010+ #010+ '# Units dir'#010+ @@ -629,8 +628,8 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '# Units dir'#010+ 'ifdef REQUIRE_PACKAGESDIR'#010+ - 'override PACKAGESDIR','+=$(REQUIRE_PACKAGESDIR)'#010+ - 'endif'#010+ + 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ + 'end','if'#010+ #010+ #010+ '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+ @@ -638,12 +637,12 @@ const fpcmakeini : array[0..259,1..240] of char=( '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ - 'ifneq ($(findstring $(OS_TARGET)',',$(UNIXs)),)'#010+ + 'ifneq ($(filter $(OS_TARGET),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ 'endif'#010+ - 'else'#010+ + 'el','se'#010+ '# Normal install'#010+ - 'ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)'#010+ + 'ifneq ($(filter $(OS_SOURCE),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ 'endif'#010+ 'endif'#010+ @@ -653,9 +652,9 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ 'endif'#010+ - 'en','dif'#010+ + 'endif'#010+ #010+ - '# set the prefix directory where to install everything'#010+ + '# set the prefix directory wher','e to install everything'#010+ 'ifndef INSTALL_PREFIX'#010+ 'ifdef UNIXHier'#010+ 'INSTALL_PREFIX=/usr/local'#010+ @@ -667,9 +666,9 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'export IN','STALL_PREFIX'#010+ + 'export INSTALL_PREFIX'#010+ #010+ - '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+ + '# Export also INSTALL_','SOURCESUBDIR set so it will be'#010+ '# used recursively for all subdirs'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ 'export INSTALL_FPCSUBDIR'#010+ @@ -677,11 +676,11 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '# Where to place the resulting zip files'#010+ 'ifndef DIST_DESTDIR'#010+ - 'DIST_DESTDIR:=$(BASED','IR)'#010+ + 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ 'export DIST_DESTDIR'#010+ #010+ - '# EXE/PPU Target directories'#010+ + '# EXE','/PPU Target directories'#010+ 'ifndef COMPILER_UNITTARGETDIR'#010+ 'ifdef PACKAGEDIR_MAIN'#010+ 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ @@ -689,8 +688,8 @@ const fpcmakeini : array[0..259,1..240] of char=( 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ - 'if','ndef COMPILER_TARGETDIR'#010+ - 'COMPILER_TARGETDIR=.'#010+ + 'ifndef COMPILER_TARGETDIR'#010+ + 'COMPILER_TAR','GETDIR=.'#010+ 'endif'#010+ #010+ #010+ @@ -698,8 +697,8 @@ const fpcmakeini : array[0..259,1..240] of char=( '# Install Directories'#010+ '#####################################################################'#010+ #010+ - '# set the base directory',' where to install everything'#010+ - 'ifndef INSTALL_BASEDIR'#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+ @@ -707,18 +706,18 @@ const fpcmakeini : array[0..259,1..240] of char=( 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_BASEDIR:=$(','INSTALL_PREFIX)'#010+ + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# set the directory where to install the binaries'#010+ + '# set t','he directory where to install the binaries'#010+ 'ifndef INSTALL_BINDIR'#010+ 'ifdef UNIXHier'#010+ 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ - '# for FPC packages install the binaries un','der their target subdir'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ + '# for FPC packages install the binaries under their target subdir'#010+ + 'ifdef INSTAL','L_FPCPACKAGE'#010+ 'ifdef CROSSCOMPILE'#010+ 'ifdef CROSSINSTALL'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+ @@ -726,21 +725,21 @@ const fpcmakeini : array[0..259,1..240] of char=( 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(T','ARGETSUFFIX)'#010+ - 'endif'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ + 'endif',#010+ #010+ '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef PACKAGE_NAME'#010+ - 'INSTALL_UNITDIR:=$(INSTALL_UN','ITDIR)/$(PACKAGE_NAME)'#010+ - 'endif'#010+ + 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ + 'e','ndif'#010+ #010+ '# Where to install shared libraries'#010+ 'ifndef INSTALL_LIBDIR'#010+ @@ -751,9 +750,9 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the source files will be s','tored'#010+ + '# Where the source files will be stored'#010+ 'ifndef INSTALL_SOURCEDIR'#010+ - 'ifdef UNIXHier'#010+ + 'ifdef',' UNIXHier'#010+ 'ifdef BSDhier'#010+ 'SRCPREFIXDIR=share/src'#010+ 'else'#010+ @@ -765,16 +764,16 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_P','REFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSI'+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VER','SI'+ 'ON)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PA','CKAGE_NAME)'+ - '-$(PACKAGE_VERSION)'#010+ - 'endif'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ + '(PACKAGE_VERSION)'#010+ + 'endif',#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ @@ -782,9 +781,9 @@ const fpcmakeini : array[0..259,1..240] of char=( 'CKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ - 'e','ndif'#010+ + 'endif'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+ + 'INSTALL_SOURCEDIR:=$(INSTA','LL_BASEDIR)/source'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -798,10 +797,10 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ifdef linuxHier'#010+ 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ - 'DOCPRE','FIXDIR=doc'#010+ + 'DOCPREFIXDIR=doc'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ + 'ifdef INSTALL','_FPCPACKAGE'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ '(PACKAGE_NAME)'#010+ 'else'#010+ @@ -809,8 +808,8 @@ const fpcmakeini : array[0..259,1..240] of char=( 'CKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ - 'ifdef ','INSTALL_FPCPACKAGE'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ + 'INSTALL_DOCDIR:=$','(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ @@ -818,8 +817,8 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Where to install the examples, under linux we use the doc dir'#010+ - '# because the copytree command will cre','ate a subdir itself'#010+ - 'ifndef INSTALL_EXAMPLEDIR'#010+ + '# because the copytree command will create a subdir itself'#010+ + 'ifndef INSTALL_E','XAMPLEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ #010+ @@ -828,10 +827,10 @@ const fpcmakeini : array[0..259,1..240] of char=( ')/$(PACKAGE_NAME)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_','DOCDIR)/examples'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ 'else'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+ - '$(PACKAGE_NAME)'#010+ + 'INSTALL_EXAMPL','EDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/example'+ + 's/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -841,9 +840,9 @@ const fpcmakeini : array[0..259,1..240] of char=( 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+ '(PACKAGE_VERSION)'#010+ 'else'#010+ - 'ifdef ','linuxHier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+ - 'GE_VERSION)'#010+ + 'ifdef linuxHier'#010+ + 'INSTALL_EXAMPLEDIR:=$(INST','ALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PAC'+ + 'KAGE_VERSION)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ 'RSION)'#010+ @@ -853,7 +852,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_EXAMPLEDI','R:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PAC','KAGE_NAME)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ 'endif'#010+ @@ -865,21 +864,21 @@ const fpcmakeini : array[0..259,1..240] of char=( 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ - 'ifndef',' INSTALL_SHAREDDIR'#010+ - 'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+ + 'ifndef INSTALL_SHAREDDIR'#010+ + 'INSTALL_SHAREDDIR','=$(INSTALL_PREFIX)/lib'#010+ 'endif'#010+ #010+ '#####################################################################'#010+ '# Cross compile dirs'#010+ '#####################################################################'#010+ #010+ - 'ifdef CROSSC','OMPILE'#010+ - '# Directory where the cross compile tools are stored.'#010+ + 'ifdef CROSSCOMPILE'#010+ + '# Directory where the cross c','ompile tools are stored.'#010+ '# First check if they are available in FPCDIR. If no targets/ subdir'#010+ '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ 'ifndef CROSSBINDIR'#010+ - 'CROSSBINDIR:=$(wildcard $(CROSSTARGE','TDIR)/bin/$(SOURCESUFFIX))'#010+ - 'ifeq ($(CROSSBINDIR),)'#010+ + 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ + 'ifeq ($(C','ROSSBINDIR),)'#010+ 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ '(FULL_SOURCE))'#010+ 'endif'#010+ @@ -891,21 +890,21 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '[dirlibc]'#010+ '# On linux, try to find where libgcc.a is.'#010+ - 'ifeq ($(OS_SOU','RCE),linux)'#010+ + 'ifeq ($(OS_SOURCE),linux)'#010+ #010+ '# Amd64 to i386?'#010+ - 'ifndef GCCLIBDIR'#010+ + 'ifndef',' GCCLIBDIR'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ - 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+ + 'ifneq ($(filter x86_64,$(shell uname -a)),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-m32'#010+ 'endif'#010+ - 'en','dif'#010+ + 'endif'#010+ 'endif'#010+ 'ifeq ($(CPU_TARGET),powerpc)'#010+ - 'ifeq ($(BINUTILSPREFIX),)'#010+ + 'i','feq ($(BINUTILSPREFIX),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'else'#010+ 'CROSSGCCOPT=-m32'#010+ @@ -913,18 +912,18 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'ifeq ($(CPU_TARGET),powerpc64)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell di','rname `gcc -m64 -print-libgcc-file-name`)'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`',')'#010+ 'else'#010+ 'CROSSGCCOPT=-m64'#010+ 'endif'#010+ 'endif'#010+ 'ifeq ($(CPU_TARGET),sparc)'#010+ - 'ifneq ($(findstring sparc64,$(shell uname -a)),)'#010+ + 'ifneq ($(filter sparc64,$(shell uname -a)),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)',#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'else'#010+ - '# gcc mips seems not to recognize -m32/-m64'#010+ - 'ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)'#010+ + '# gcc mips seems not to recognize -m32','/-m64'#010+ + 'ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)'#010+ 'CROSSGCCOPT=-mabi=32'#010+ 'else'#010+ 'CROSSGCCOPT=-m32'#010+ @@ -935,36 +934,36 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Check if FPCFPMAKE compiler is same target as FPC'#010+ - 'ifdef FP','CFPMAKE'#010+ - 'FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE) -iTP)'#010+ + 'ifdef FPCFPMAKE'#010+ + 'FPCFPMAKE_CPU_TARGET=$(shell $(FPCFPMAKE',') -iTP)'#010+ 'ifeq ($(CPU_TARGET),$(FPCFPMAKE_CPU_TARGET))'#010+ '# In that case use GCCLIBDIR value for FPCMAKEGCCLIBDIR'#010+ 'FPCMAKEGCCLIBDIR:=$(GCCLIBDIR)'#010+ 'else'#010+ - 'ifneq ($(findstring $(FPCFPMAKE_CPU_TARGET),aar','ch64 powerpc64 riscv6'+ - '4 sparc64 x86_64),)'#010+ - 'FPCMAKE_CROSSGCCOPT=-m64'#010+ + 'ifneq ($(filter $(FPCFPMAKE_CPU_TARGET),aarch64 powerpc64 riscv64 spar'+ + 'c64 x86_64),)'#010+ + 'FPCMAKE_CRO','SSGCCOPT=-m64'#010+ 'else'#010+ - 'ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)'#010+ + 'ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips64 mips64el),)'#010+ 'FPCMAKE_CROSSGCCOPT=-mabi=64'#010+ 'else'#010+ - 'ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),mips mipsel),)'#010+ - 'FPCMAKE_CROSSGCCOPT','=-mabi=32'#010+ + 'ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)'#010+ + 'FPCMAKE_CROSSGCCOPT=-mabi=32'#010+ 'else'#010+ - 'ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv64),)'#010+ - 'FPCMAKE_CROSSGCCOPT=-mabi=lp64'#010+ + 'ifeq ($(FPCFPMAKE_CPU_OPT),riscv64)'#010+ + 'FPCMAKE_C','ROSSGCCOPT=-mabi=lp64'#010+ 'else'#010+ - 'ifneq ($(findstring $(FPCFPMAKE_CPU_OPT),riscv32),)'#010+ + 'ifeq ($(FPCFPMAKE_CPU_OPT),riscv32)'#010+ 'FPCMAKE_CROSSGCCOPT=-mabi=ilp32'#010+ 'else'#010+ 'FPCMAKE_CROSSGCCOPT=-m32'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'endif',#010+ + 'endif'#010+ 'endif'#010+ 'FPCMAKEGCCLIBDIR:=$(shell dirname `gcc $(FPCMAKE_CROSSGCCOPT) -print-l'+ - 'ibgcc-file-name`)'#010+ + 'ibgcc-file-name','`)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -974,9 +973,9 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '# Try cross gcc'#010+ 'ifndef GCCLIBDIR'#010+ - 'CRO','SSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+ - 'EEXT),$(SEARCHPATH))))'#010+ - 'ifneq ($(CROSSGCC),)'#010+ + 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+ + 'XT),$(SEARCHPATH))))'#010+ + 'ifne','q ($(CROSSGCC),)'#010+ 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) $(CROSSGCCOPT) -print-libgcc-f'+ 'ile-name`)'#010+ 'endif'#010+ @@ -984,21 +983,20 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ '#ifeq($(OS_SOURCE),linux)'#010+ #010+ - 'ifdef',' inUnix'#010+ + 'ifdef inUnix'#010+ 'ifeq ($(OS_SOURCE),netbsd)'#010+ 'OTHERLIBDIR:=/usr/pkg/lib'#010+ 'endif'#010+ - 'export GCCLIBDIR FPCMAKEGCCLIBDIR OTHERLIBDIR'#010+ + 'export GCCLIBDIR FPCMAKEG','CCLIBDIR OTHERLIBDIR'#010+ 'endif'#010+ #010+ #010+ '[extensions]'#010+ '#####################################################################'#010+ '# Default extensions'#010+ - '###############','#####################################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ - '# Default needed extensions (Go32v2,Linux)'#010+ + '# Default needed extensions (Go32v2,','Linux)'#010+ 'BATCHEXT=.bat'#010+ 'LOADEREXT=.as'#010+ 'EXEEXT=.exe'#010+ @@ -1010,24 +1008,24 @@ const fpcmakeini : array[0..259,1..240] of char=( 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ - 'SH','AREDLIBPREFIX=libfp'#010+ + 'SHAREDLIBPREFIX=libfp'#010+ 'STATICLIBPREFIX=libp'#010+ 'IMPORTLIBPREFIX=libimp'#010+ 'RSTEXT=.rst'#010+ - '# external debug info for executable'#010+ + '# external debug',' info for executable'#010+ 'EXEDBGEXT=.dbg'#010+ '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ ' has this'#010+ #010+ '# Go32v1'#010+ - 'ifeq ($(OS_TARGET),go3','2v1)'#010+ + 'ifeq ($(OS_TARGET),go32v1)'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=v1'#010+ 'endif'#010+ #010+ '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ - 'STATICLIBPREFIX='#010+ + 'STATICLIBPRE','FIX='#010+ 'SHORTSUFFIX=dos'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ @@ -1038,13 +1036,13 @@ const fpcmakeini : array[0..259,1..240] of char=( 'OEXT=.obj'#010+ 'ASMEXT=.asm'#010+ 'SHAREDLIBEXT=.dll'#010+ - 'SHORTSUFFI','X=wat'#010+ + 'SHORTSUFFIX=wat'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ #010+ '# Android native'#010+ 'ifneq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_TARGET),android)'#010+ + 'ifeq ($(OS_TARGET),','android)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1057,14 +1055,14 @@ const fpcmakeini : array[0..259,1..240] of char=( 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHOR','TSUFFIX=lnx'#010+ + 'SHORTSUFFIX=lnx'#010+ 'endif'#010+ #010+ '# DragonFly BSD'#010+ 'ifeq ($(OS_TARGET),dragonfly)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010+ + 'HASSHA','REDLIB=1'#010+ 'SHORTSUFFIX=df'#010+ 'endif'#010+ #010+ @@ -1077,7 +1075,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# NetBSD'#010+ - 'ifeq ($(OS_','TARGET),netbsd)'#010+ + 'ifeq ($(OS_TARGET),netbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1085,7 +1083,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# OpenBSD'#010+ - 'ifeq ($(OS_TARGET),openbsd)'#010+ + 'ifeq ($','(OS_TARGET),openbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1095,7 +1093,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '# Win32'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ 'SHAREDLIBEXT=.dll'#010+ - 'SHORTSUFFIX=w32'#010, + 'SHORTSUFFIX=w32'#010+ 'endif'#010+ #010+ '# OS/2'#010+ @@ -1103,7 +1101,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'SHAREDLIBE','XT=.dll'#010+ 'SHORTSUFFIX=os2'#010+ 'ECHO=echo'#010+ 'IMPORTLIBPREFIX='#010+ @@ -1114,7 +1112,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=.dl','l'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=emx'#010+ 'ECHO=echo'#010+ 'IMPORTLIBPREFIX='#010+ @@ -1122,7 +1120,7 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '# Amiga'#010+ 'ifeq ($(OS_TARGET),amiga)'#010+ - 'EXEEXT='#010+ + 'EXEEXT','='#010+ 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=amg'#010+ 'endif'#010+ @@ -1135,14 +1133,14 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# MorphOS'#010+ - 'ifeq ','($(OS_TARGET),morphos)'#010+ + 'ifeq ($(OS_TARGET),morphos)'#010+ 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=mos'#010+ 'endif'#010+ #010+ '# Atari'#010+ - 'ifeq ($(OS_TARGET),atari)'#010+ + 'ifeq ($(','OS_TARGET),atari)'#010+ 'EXEEXT=.ttp'#010+ 'SHORTSUFFIX=ata'#010+ 'endif'#010+ @@ -1155,14 +1153,14 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Haiku'#010+ - 'ifeq ($(OS_T','ARGET),haiku)'#010+ + 'ifeq ($(OS_TARGET),haiku)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=hai'#010+ 'endif'#010+ #010+ '# Solaris'#010+ - 'ifeq ($(OS_TARGET),solaris)'#010+ + 'ifeq ($(OS_TARGET),solar','is)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=sun'#010+ @@ -1176,14 +1174,14 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Netware clib'#010+ - 'ifeq ($(OS_','TARGET),netware)'#010+ + 'ifeq ($(OS_TARGET),netware)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=nw'#010+ 'IMPORTLIBPREFIX=imp'#010+ 'endif'#010+ #010+ - '# Netware libc'#010+ + '# Ne','tware libc'#010+ 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ @@ -1192,16 +1190,16 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Mac OS Classic'#010+ - 'ifeq ($(OS_TARGET),','macosclassic)'#010+ + 'ifeq ($(OS_TARGET),macosclassic)'#010+ 'BATCHEXT='#010+ 'EXEEXT='#010+ 'DEBUGSYMEXT=.xcoff'#010+ 'SHORTSUFFIX=mac'#010+ 'IMPORTLIBPREFIX=imp'#010+ - 'endif'#010+ + 'endif',#010+ #010+ '# Darwin'#010+ - 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)'#010+ + 'ifneq ($(filter $(OS_TARGET),darwin iphonesim ios),)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1209,7 +1207,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'EXEDBGEXT=.dSYM'#010+ 'endif'#010+ #010+ - '# gba',#010+ + '# gba'#010+ 'ifeq ($(OS_TARGET),gba)'#010+ 'EXEEXT=.gba'#010+ 'SHAREDLIBEXT=.so'#010+ @@ -1217,7 +1215,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Symbian OS'#010+ - 'ifeq ($(OS_TARGET),symbian)'#010+ + 'ifeq (','$(OS_TARGET),symbian)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=symbian'#010+ 'endif'#010+ @@ -1225,7 +1223,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '# NativeNT'#010+ 'ifeq ($(OS_TARGET),NativeNT)'#010+ 'SHAREDLIBEXT=.dll'#010+ - 'SHORTSUFFIX=nativen','t'#010+ + 'SHORTSUFFIX=nativent'#010+ 'endif'#010+ #010+ '# wii'#010+ @@ -1235,7 +1233,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'SHORTSUFFIX=wii'#010+ 'endif'#010+ #010+ - '# AIX'#010+ + '# AIX',#010+ 'ifeq ($(OS_TARGET),aix)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ @@ -1247,13 +1245,13 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ifeq ($(OS_TARGET),java)'#010+ 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ - 'SHARE','DLIBEXT=.jar'#010+ + 'SHAREDLIBEXT=.jar'#010+ 'SHORTSUFFIX=java'#010+ 'endif'#010+ #010+ '# Android java'#010+ 'ifeq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_TARGET),android)'#010+ + 'ifeq ($(OS_TARGET),','android)'#010+ 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ 'SHAREDLIBEXT=.jar'#010+ @@ -1264,14 +1262,14 @@ const fpcmakeini : array[0..259,1..240] of char=( '# MS-DOS'#010+ 'ifeq ($(OS_TARGET),msdos)'#010+ 'STATICLIBPREFIX='#010+ - 'STATICLIBE','XT=.a'#010+ + 'STATICLIBEXT=.a'#010+ 'SHORTSUFFIX=d16'#010+ 'endif'#010+ #010+ '# MSX-DOS'#010+ 'ifeq ($(OS_TARGET),msxdos)'#010+ 'STATICLIBPREFIX='#010+ - 'STATICLIBEXT=.a'#010+ + 'STATICLIBEXT=','.a'#010+ 'SHORTSUFFIX=msd'#010+ 'endif'#010+ #010+ @@ -1282,7 +1280,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'STATICLIBEXT=.a'#010+ 'else'#010+ 'EXEEXT=.bin'#010+ - 'e','ndif'#010+ + 'endif'#010+ 'ifeq ($(CPU_TARGET),z80)'#010+ 'OEXT=.rel'#010+ 'endif'#010+ @@ -1290,7 +1288,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Win16'#010+ - 'ifeq ($(OS_TARGET),win16)'#010+ + 'ifeq ($(OS_TARGET),','win16)'#010+ 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ @@ -1302,56 +1300,57 @@ const fpcmakeini : array[0..259,1..240] of char=( 'OEXT=.rel'#010+ 'endif'#010+ #010+ - '#',' WASI'#010+ + '# WASI'#010+ 'ifeq ($(OS_TARGET),wasi)'#010+ 'EXEEXT=.wasm'#010+ 'endif'#010+ #010+ #010+ '# For 8.3 limited OS'#039's the short suffixes'#010+ - '# Otherwise use the full source/target names'#010+ - 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ + '# ','Otherwise use the full source/target names'#010+ + 'ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)'#010+ 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ - 'ZIPSUFFIX=$(SHORTSUFF','IX)'#010+ + 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ 'ZIPEXAMPLESUFFIX=exm'#010+ 'else'#010+ 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+ - 'ZIPSOURCESUFFIX=.source'#010+ + 'ZI','PSOURCESUFFIX=.source'#010+ 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ 'else'#010+ - 'ZIPSUFFI','X=.$(TARGETSUFFIX)'#010+ + 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'endif'#010+ 'endif'#010+ #010+ '[defaulttools]'#010+ - '#####################################################################'#010+ + '#####################################','###############################'+ + '#'#010+ '# Default Tools'#010+ '#####################################################################'#010+ #010+ - '# Names of the binut','ils tools'#010+ + '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#010+ - 'RCNAME=$(BINUTILSPREFIX)rc'#010+ + 'RCNAME=$(','BINUTILSPREFIX)rc'#010+ 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ 'ifndef ASPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ASPROG=$(CROSS','BINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ + 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ASPROG=$(ASNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# linker, but probably not used'#010+ - 'ifndef LDPROG'#010+ + 'ifn','def LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1360,7 +1359,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Resource compiler'#010+ - 'ifndef RCPRO','G'#010+ + 'ifndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1368,7 +1367,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Archiver'#010+ + '#',' Archiver'#010+ 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ @@ -1377,10 +1376,10 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# NASM assembler, r','edefine it if cross compiling'#010+ + '# NASM assembler, redefine it if cross compiling'#010+ 'ifndef NASMPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+ + 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$','(SRCEXEEXT)'#010+ 'else'#010+ 'NASMPROG=$(NASMNAME)'#010+ 'endif'#010+ @@ -1391,7 +1390,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'LD=$(LDPROG)'#010+ 'RC=$(RCPROG)'#010+ 'AR=$(ARPROG)'#010+ - 'NASM=$(NASMPROG)'#010, + 'NASM=$(NASMPROG)'#010+ #010+ '# ppas.bat / ppas.sh'#010+ 'ifdef inUnix'#010+ @@ -1400,7 +1399,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'PPAS=ppas$(SRCBATCHEXT)'#010+ 'endif'#010+ #010+ - '# ldconfig to rebuild .so cache'#010+ + '# l','dconfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ 'LDCONFIG=ldconfig'#010+ 'else'#010+ @@ -1410,7 +1409,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ifdef DATE'#010+ 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ - 'DATESTR=',#010+ + 'DATESTR='#010+ 'endif'#010+ #010+ '# Zip options'#010+ @@ -1420,7 +1419,7 @@ const fpcmakeini : array[0..259,1..240] of char=( '# Tar options'#010+ 'ifeq ($(USETAR),bz2)'#010+ 'TAROPT=vj'#010+ - 'TAREXT=.tar.bz2'#010+ + 'TAREXT=.ta','r.bz2'#010+ 'else'#010+ 'TAROPT=vz'#010+ 'TAREXT=.tar.gz'#010+ @@ -1429,19 +1428,19 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '[command_begin]'#010+ '#####################################################################'#010+ - '# Compiler',' Command Line'#010+ + '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ + '# Load commandl','ine 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+ - 'endif',#010+ + 'endif'#010+ #010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ - 'override FPCOPT+=-T$(OS_TARGET)'#010+ + 'o','verride FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ @@ -1449,40 +1448,40 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ - 'over','ride FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ + 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ - 'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ + 'override FPMAKE_BU','ILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ - 'ifneq ($(RLIN','KPATH),)'#010+ + 'ifneq ($(RLINKPATH),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# When BINUTILSPREFIX is given and we are not cross-compiling then use'+ - #010+ + '# When BINUTILSPREFIX is given and we a','re not cross-compiling then u'+ + 'se'#010+ '# it while compiling the fpmake file. (For example to build i386-freeb'+ 'sd'#010+ '# with BINUTILSPREFIX=i386-)'#010+ - 'ifndef',' CROSSCOMPILE'#010+ + 'ifndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ - 'override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ + 'override FPMAKE_B','UILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# User dirs should be first, so they are looked at first'#010+ 'ifdef UNITDIR'#010+ - 'override FPCOPT+=$(addpre','fix -Fu,$(UNITDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ - 'ifdef OBJDIR'#010+ + 'ifdef OBJDI','R'#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ @@ -1490,14 +1489,14 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ #010+ '# Smartlinking'#010+ - 'ifdef LIN','KSMART'#010+ + 'ifdef LINKSMART'#010+ 'override FPCOPT+=-XX'#010+ 'endif'#010+ #010+ '# Smartlinking creation'#010+ 'ifdef CREATESMART'#010+ 'override FPCOPT+=-CX'#010+ - 'endif'#010+ + 'en','dif'#010+ #010+ '# Debug'#010+ 'ifdef DEBUG'#010+ @@ -1507,11 +1506,11 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '# Release mode'#010+ '# (strip, optimize and don'#039't load fpc.cfg)'#010+ - 'ifd','ef RELEASE'#010+ + 'ifdef RELEASE'#010+ 'FPCCPUOPT:=-O2'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ - 'endif'#010+ + 'endif',#010+ #010+ '# Strip'#010+ 'ifdef STRIP'#010+ @@ -1523,26 +1522,26 @@ const fpcmakeini : array[0..259,1..240] of char=( 'override FPCOPT+=-O2'#010+ 'endif'#010+ #010+ - '# Verbose settings (warning,note,in','fo)'#010+ + '# Verbose settings (warning,note,info)'#010+ 'ifdef VERBOSE'#010+ 'override FPCOPT+=-vwni'#010+ 'endif'#010+ #010+ '# Needed compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ - 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ + 'ove','rride FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ - 'ifdef COMPILER_LI','BRARYDIR'#010+ + 'ifdef COMPILER_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ + 'ove','rride FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR)',')'#010+ + 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ 'endif'#010+ #010+ '# Cross compiler utils'#010+ @@ -1550,45 +1549,45 @@ const fpcmakeini : array[0..259,1..240] of char=( 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ - '# Target dirs 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+ + 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Unit target dir (default is units/-/'#010+ + '# Un','it target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ - 'ifeq ($(COMPILER_UNIT','TARGETDIR),.)'#010+ + 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ + 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETD','IR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ - 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFI','X)'#010+ + 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ 'ifdef SYSROOTPATH'#010+ 'override FPCOPT+=-XR$(SYSROOTPATH)'#010+ 'else'#010+ - '# if we are compiling natively on aarch64-darwin and if -/Library/Deve'+ - 'loper/CommandLineTools/SDKs/MacOSX.sdk exists,'#010+ + '# if we are compiling nati','vely 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+ - 'ifneq ($(findstring $(OS_TARGET),darwin),)'#010+ + 'ifeq ($(OS_TARGET),$(OS_SOURCE))'#010+ + 'ifeq ($(OS_TARGET),darwin)'#010+ '# so far the only tested one'#010+ - 'ifneq ($(findstring $(CPU_TARGET),aarch64),)'#010+ + 'ifeq ($(CPU_TARGET),aa','rch64)'#010+ 'ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk)'+ ',)'#010+ - 'override FPCOPT+=-XR/Library','/Developer/CommandLineTools/SDKs/MacOSX.'+ - 'sdk'#010+ + 'override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sd'+ + 'k'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1599,14 +1598,13 @@ const fpcmakeini : array[0..259,1..240] of char=( 'override FPCOPT+=-Cg'#010+ 'endif'#010+ #010+ - '# create always pic'#039'ed code on x86_64, mips and mipsel'#010+ + '# create a','lways pic'#039'ed code on x86_64, mips and mipsel'#010+ '# on unix-like systems'#010+ - 'ifneq ($(findstring $(OS_TARGET),dragonf','ly freebsd openbsd netbsd li'+ - 'nux solaris),)'#010+ - 'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64 powerpc64'+ - '),)'#010+ + 'ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux so'+ + 'laris),)'#010+ + 'ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel riscv64 powerpc64),)'#010+ 'override FPCOPT+=-Cg'#010+ - 'endif'#010+ + 'en','dif'#010+ 'endif'#010+ #010+ 'ifdef LINKSHARED'#010+ @@ -1615,17 +1613,17 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ #010+ '[command_libc]'#010+ - '#',' Add GCC lib path if asked'#010+ + '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'ifdef FPCMAKEGCCLIBDIR'#010+ - 'override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDIR)'#010+ + 'override FPCMAKEOPT+=-Fl$(FPCMAKEGCCLIBDI','R)'#010+ 'else'#010+ 'override FPCMAKEOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addpre','fix -Fl,$(OTHERLIBDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ @@ -1635,51 +1633,51 @@ const fpcmakeini : array[0..259,1..240] of char=( 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Override options to compile the fpmake-binary with command-line opti'+ - 'ons provided in FPMAKEBUILDOPT'#010, + '#',' Override options to compile the fpmake-binary with command-line op'+ + 'tions provided in FPMAKEBUILDOPT'#010+ 'ifdef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ 'endif'#010+ #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ - 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ + 'override FPC','OPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'override FPCO','PT+=@$(CFGFILE)'#010+ + 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ - 'override FPCOPT:=!FPCEXTCMD'#010+ + 'override FPCOPT:=!FPCEX','TCMD'#010+ 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'override AFULL_SOURCE=','$(CPU_SOURCE)-$(OS_SOURCE)'#010+ + 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ 'endif'#010+ #010+ 'ifdef ACROSSCOMPILE'#010+ - 'override FPCOPT+=$(CROSSOPT)'#010+ + 'override FPCOPT+=$(C','ROSSOPT)'#010+ 'endif'#010+ #010+ '# Compiler commandline'#010+ 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ #010+ - '# also call ppa','s if with command option -s'#010+ + '# also call ppas if with command option -s'#010+ '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ '# or if -sh is used'#010+ - 'ifneq (,$(findstring -sh ,$(COMPILER)))'#010+ - 'UseEXECPPAS=1'#010+ + 'ifneq (,$(filter -sh,$(COMPILER)))'#010+ + 'U','seEXECPPAS=1'#010+ 'endif'#010+ - 'ifneq (,$(findstring -s ,$(COMPILER)))'#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010, + 'ifneq (,$(filter -s,$(COMPILER)))'#010+ + 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ 'endif'#010+ @@ -1693,93 +1691,93 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - #010+ + #010, '[loaderrules]'#010+ '#####################################################################'#010+ - '# Load','ers'#010+ + '# Loaders'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ 'ifneq ($(TARGET_LOADERS),)'#010+ - 'override ALLTARGET+=fpc_loaders'#010+ + 'override ALLTARGET+=fpc_loa','ders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ - #010, + #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ + ' $(AS) -o $(COMPILER_','UNITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPI','LER_UNITTARGETDIR) $(LOADEROFILES)'#010+ + 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ - ')'#010+ + ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFI','LE'+ + 'S))'#010+ 'else'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ - ' $(MKDIR) $(','INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ - ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ + ' ',' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ #010+ #010+ '[unitrules]'#010+ - '#####################','###############################################'+ - '#'#010+ + '#####################################################################'#010+ '# Units'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ - 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ + 'ifn','eq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITP','PUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ + 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ - 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICIT','UNITPPUFILES)'#010+ + 'override INSTALLPPUFILES+=','$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ - '#####################################################################'#010+ + '###############################################################','#####'+ + '#'#010+ '# Exes'#010+ '#####################################################################'#010+ #010+ - '.PHON','Y: fpc_exes'#010+ + '.PHONY: fpc_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)) $(addsuf','f'+ - 'ix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsu'+ - 'ffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFI'+ - 'X),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ - 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),','$(TARGET_PROGRAMS))'#010+ + 'override EXEFILES=$(addsuffix $(EXEEXT','),$(TARGET_PROGRAMS))'#010+ + 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffi'+ + 'x $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuf'+ + 'fix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX'+ + '),$(adds','uffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ + 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ - 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ + 'override CLEA','NEXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $','(AOUTEXT),$(TARGET_PROGRAMS))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1787,74 +1785,75 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+ + 'fpc_','exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES'+ + ')'#010+ #010+ #010+ '[rstrules]'#010+ - '###########','#########################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Resource strings'#010+ '#####################################################################'#010+ #010+ - 'ifdef TARGET_RSTS'#010+ + 'i','fdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRS','TFILES+=$(RSTFILES)'#010+ + 'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '#####################################################################'#010+ + '##########################','##########################################'+ + '#'#010+ #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifneq ($(TARGET_EXAMPLE','S),)'#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+ + 'ES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(','TARGET_'+ + 'EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(adds'+ - 'uffix $(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(a'+ - 'ddsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIB', - 'PREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ + 'uffix $(LTOEXT),$(TARGET_EXAMPLES)) $(addprefix $','(STATICLIBPREFIX),$'+ + '(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLI'+ + 'BPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ #010+ #010+ - 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ + 'override CLEANEXEFILE','S+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ - 'ifeq ($(','OS_TARGET),os2)'#010+ + 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $','(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'endif'#010+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ 'HASEXAMPLES=1'#010+ - 'end','if'#010+ + 'endif'#010+ #010+ 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ 'S))'#010+ #010+ #010+ '[compilerules]'#010+ - '#####################################################################'#010+ - '# General compile rules'#010+ - '###################################################','#################'+ + '#######################################################','#############'+ '#'#010+ + '# General compile rules'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ - ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ + ' @$(ECHOREDIR) Comp','iled > $(FPCMADE)'#010+ #010+ 'fpc_all: $(FPCMADE)'#010+ #010+ 'fpc_smart:'#010+ - ' $(MAKE) all LINKSMART=1 CREATES','MART=1'#010+ + ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ @@ -1862,10 +1861,10 @@ const fpcmakeini : array[0..259,1..240] of char=( 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ #010+ - '# General compile rules, available for both possible .pp and .pas exte'+ - 'nsions'#010+ + '# General compile rules, available for both possible .pp a','nd .pas ex'+ + 'tensions'#010+ #010+ - '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r', + '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+ 'c .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ @@ -1873,13 +1872,13 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '$(COMPILER_TARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ - #010+ + #010, '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ - ' $(C','OMPILER) $<'#010+ + ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ @@ -1888,37 +1887,38 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ '%$(EXEEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPPAS)'#010+ + ' $(EXECP','PAS)'#010+ #010+ '%$(EXEEXT): %.lpr'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.dpr'#010+ - ' ',' $(COMPILER) $<'#010+ + ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ - 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)',#010+ + 'vpath %.pp $(COMPILER_','SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010, 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+ - 'vpath ','%$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ + 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ '# Library'#010+ - '#####################################################################'#010+ + '##################','##################################################'+ + '#'#010+ #010+ '.PHONY: fpc_shared'#010+ #010+ - 'override INSTALLT','ARGET+=fpc_shared_install'#010+ + 'override INSTALLTARGET+=fpc_shared_install'#010+ #010+ 'ifndef SHARED_LIBVERSION'#010+ 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ @@ -1926,26 +1926,26 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ 'ifndef SHARED_LIBNAME'#010+ 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ - 'endif'#010+ + 'endif',#010+ #010+ 'ifndef SHARED_FULLNAME'#010+ - 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBV','ERS'+ - 'ION)$(SHAREDLIBEXT)'#010+ + 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ + 'N)$(SHAREDLIBEXT)'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef SHARED_LIBUNITS'#010+ - 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ + 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICIT','UNITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ - 'end','if'#010+ + 'endif'#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$(BINUTILSPREFIX)'#010+ + ' $(PPUMOVE) -q $(SHA','RED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+ + ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ @@ -1953,127 +1953,127 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ 'fpc_shared_install:'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ - 'ifneq ($(SHARED_LIBUNITS),)'#010+ + 'ifneq ($(SHARED_L','IBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ - ' $(INS','TALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+ - 'STALL_SHAREDDIR)'#010+ + ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ + 'ALL_SHAREDDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ '[installrules]'#010+ - '#####################################################################'#010+ - '# Install rules'#010+ - '################################################','####################'+ + '############################################','########################'+ '#'#010+ + '# Install rules'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$','(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ - 'override INSTALLPPUFILES:=$(filter-out $(I','NSTALL_BUILDUNIT)$(PPUEXT)'+ - ',$(INSTALLPPUFILES))'#010+ + 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_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),$(STATI','CLIBPREFIX)-$(STATI'+ - 'CLIBEXT))'#010+ + '# in this cas','e, happends for instance for OS/2 target'#010+ + 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+ + 'IBEXT))'#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'+ + 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES',')) $(addprefix $('+ + 'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ + ') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ 'NSTALLPPUFILES)))'#010+ 'else'#010+ - 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+ - 'ATICLIBPRE','FIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ + 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(IN','STALLPPU'+ + 'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+ + 'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ ')'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ - 'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+ + 'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPU','FILES))'#010+ 'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+ - 'override INSTAL','LPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTAL'+ - 'LPPUFILENAMES))'#010+ + 'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+ + 'PUFILENAMES))'#010+ 'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+ - 'FIX),$(INSTALLPPULINKFILENAMES)))'#010+ + 'FIX),$(INST','ALLPPULINKFILENAMES)))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ - 'override INSTALL_CREATEPACKA','GEFPC=1'#010+ + 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ - 'STALLEXEFILES)))'#010+ + 'STALLEXEFILES))',')'#010+ 'endif'#010+ 'endif'#010+ #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' $(MKDIR) $(','INSTALL_BINDIR)'#010+ + ' $(MKDIR) $(INSTALL_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+ + '# If the fpcpackage vari','able is set then create and install Package.'+ + 'fpc,'#010+ + '# a safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) ','$(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'end','if'#010+ + 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ - 'ifneq ($(INSTALLPPULINKFILES),)'#010+ + 'ifneq ($(INSTALLPPULINKFILES),)'#010, ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB','_FULLNAME)),)'#010+ + 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + ' ln -sf $(LIB_FULLNAME) $(IN','STALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FILES'#010+ - ' $(MKDIR) $(INSTALL','_DATADIR)'#010+ + ' $(MKDIR) $(INSTALL_DATADIR)'#010+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ - ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ + ' $(C','OPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(','addsuffix _distclean,$'+ - '(TARGET_EXAMPLEDIRS))'#010+ + 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+ + 'ARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ - ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ + ' $(COPY) $(','EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTRE','E) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ - 'EXAMPLEDIR)'#010+ + ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ + 'AMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ - '#####################################################################'#010+ - '# Dist Install'#010+ - '##################################################################','##'+ + '#############################################################','#######'+ '#'#010+ + '# Dist Install'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_distinstall'#010+ #010+ @@ -2081,17 +2081,19 @@ const fpcmakeini : array[0..259,1..240] of char=( #010+ #010+ '[zipinstallrules]'#010+ - '#####################################################################'#010+ + '############################################################','########'+ + '#'#010+ '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PH','ONY: fpc_zipinstall 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+ + '# subdir, because the delt','ree can'#039't see the whole tree to remove'+ + #010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ - 'PACKDIR=$(BASEDIR)/../','fpc-pack'#010+ + 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ 'PACKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ @@ -2100,14 +2102,14 @@ const fpcmakeini : array[0..259,1..240] of char=( '# Maybe create default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ - 'ZIPNAME=$(DIST_ZIPNAME)'#010+ + 'ZIPNAME=$(DIST_ZIPN','AME)'#010+ 'else'#010+ 'ZIPNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCROSSPR','EFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ + 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ @@ -2116,7 +2118,7 @@ const fpcmakeini : array[0..259,1..240] of char=( 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ - 'endif'#010+ + 'endif',#010+ 'endif'#010+ #010+ '# Use tar by default under linux'#010+ @@ -2125,59 +2127,58 @@ const fpcmakeini : array[0..259,1..240] of char=( 'USETAR=1'#010+ 'endif'#010+ 'endif'#010+ - #010, + #010+ '# Use a wrapper script by default for Os/2'#010+ 'ifndef inUnix'#010+ 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ '# We need to be able to run in the current OS so fix'#010+ - '# the path separator'#010+ + '# the path separa','tor'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTD','IR)/fpczip$(SRCBATCHEXT)'+ - ')'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ - 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ + 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010, 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFILE:=$(DIST_DES','TDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ - 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ - 'TFILE) *'#010+ + 'ZIPCMD_ZIP',':=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+ + 'ESTFILE) *'#010+ 'endif'#010+ #010+ - 'fpc_zipinstall',':'#010+ + 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ - 'ifdef USEZIPWRAPPER'#010+ + 'ifdef USEZIPWRAPP','ER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ - ' ',' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ - 'PER)'#010+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ + 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ - 'ER)'#010+ + ' $(EC','HOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRA'+ + 'PPER)'#010+ 'else'#010+ - ' echo $(ZIPCMD_C','DPACK) > $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ - ' /bin/sh $(ZIPWRAPPER)'#010+ + ' /bin/sh $','(ZIPWRAPPER)'#010+ 'else'#010+ 'ifdef RUNBATCH'#010+ ' $(RUNBATCH) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPWRAPP','ER)'#010+ + ' $(ZIPWRAPPER)'#010+ 'endif'#010+ 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ @@ -2186,9 +2187,9 @@ const fpcmakeini : array[0..259,1..240] of char=( 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ - 'fpc_zipsourceinstall:'#010+ + 'fpc','_zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ - 'S','OURCESUFFIX)'#010+ + 'SOURCESUFFIX)'#010+ #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ @@ -2196,118 +2197,117 @@ const fpcmakeini : array[0..259,1..240] of char=( 'PEXAMPLESUFFIX)'#010+ 'endif'#010+ #010+ - 'fpc_zipdistinstall:'#010+ + 'fp','c_zipdistinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+ #010+ #010+ '[cleanrules]'#010+ - '####','################################################################'+ - '#'#010+ - '# Clean rules'#010+ '#####################################################################'#010+ + '# Clean rules'#010+ + '#####################################################################'#010, #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(ad','dprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ - 'ES))'#010+ + 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ + '))'#010+ 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ 'GFILES))'#010+ 'endif'#010+ #010+ - 'ifdef CLEAN_PROGRAMS'#010+ + 'ifdef CLEAN_PROGRAM','S'#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ - 'XEEXT), $(CLEAN_PR','OGRAMS)))'#010+ + 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ - 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ + 'override CL','EANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLE','ANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ - 'S)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATIC'+ - 'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+ - 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$','(STATICLIBEXT),$(CLEANPP'+ - 'UFILES)))'#010+ + 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ + ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLI'+ + 'BPREFIX),$(subst $(PPU','EXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+ + 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+ + 'ILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'UFILES))'#010+ 'endif'#010+ - 'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+ - 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),','$(CLEANPPU'+ - 'FILENAMES))'#010+ + 'override CLEA','NPPUFILENAMES:=$(CLEANPPUFILES)'#010+ + 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+ + 'LENAMES))'#010+ 'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+ 'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+ - 'X),$(CLEANPPULINKFILENAMES)))'#010+ + 'X),$(','CLEANPPULINKFILENAMES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(D','EL) $(CLEANEXEFILES)'#010+ + ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ 'ifdef CLEANEXEDBGFILES'#010+ - ' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+ + ' -$(DELTREE) $(CLEANEXEDBG','FILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPUL','INKFILES),)'#010+ + 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ - 'endif'#010+ + 'endif'#010, 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LI','B_NAME) $(LIB_FULLNAME)'#010+ + ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+ - ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+ - 'ipt.res *_link.res'#010+ - ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BAT','CHEXT) ppaslink$('+ - 'BATCHEXT)'#010+ + ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*','.res link*.res *_s'+ + 'cript.res *_link.res'#010+ + ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ + 'TCHEXT)'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'ifdef CLEANPPUFILES'#010+ + 'ifdef',' CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' ',' -$(DEL) $(CLEANPPULINKFILES)'#010+ + ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef CLEAN_FILES'#010+ + 'ifdef CLEAN_','FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ - ' -$(DELTREE) b','in'#010+ + ' -$(DELTREE) bin'#010+ ' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+ '$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ - ' -$(DEL) *.o *.ppu *.a'#010+ + ' -$','(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) fpcmade.* Packa','ge.fpc *.fpm'#010+ + ' -$(DEL) fpcmade.* Package.fpc *.fpm'#010+ ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+ 'ipt.res *_link.res'#010+ - ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ - 'TCHEXT)'#010+ + ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(','BATCHEXT) ppaslink$('+ + 'BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ - 'ifdef DEBUGS','YMEXT'#010+ + 'ifdef DEBUGSYMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ 'ifdef LOCALFPMAKEBIN'#010+ @@ -2315,153 +2315,155 @@ const fpcmakeini : array[0..259,1..240] of char=( ' -$(DEL) $(FPMAKEBINOBJ)'#010+ 'endif'#010+ #010+ - 'fpc_distclean: cleanall'#010+ + 'fpc_distclea','n: cleanall'#010+ #010+ #010+ '[baseinforules]'#010+ - '############################################################','########'+ - '#'#010+ + '#####################################################################'#010+ '# Base info rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ #010+ - 'override INFORULES+=fpc_baseinfo'#010+ + 'override INFORULES+=fpc_basei','nfo'#010+ #010+ 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ - ' @$(ECHO) ',' Package Name..... $(PACKAGE_NAME)'#010+ + ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Configuration info =='#010+ + ' @$(ECHO) == Configuration info =='#010, ' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+ - ' @$(ECHO) FPC Version.. $(','FPC_VERSION)'#010+ + ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ - ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ + ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010, ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ - ' @$(ECHO) Full Source.. $(FULL_SOURCE',')'#010+ + ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ - ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ + ' ',' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Directory in','fo =='#010+ + ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ - ' @$(ECHO) FPCDir.......... $(FPCDIR)'#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) GCC library..... $(GCC','LIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO',') == Tools info =='#010+ + ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ - ' @$(ECHO) Rc........ $(RC)'#010+ + ' ','@$(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) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ - ' @$(ECHO)',' FPCMake... $(FPCMAKE)'#010+ + ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Object info =='#010+ + ' @$(ECHO) == Object i','nfo =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ - ' ',' @$(ECHO) Target 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 Programs..','..... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @','$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ + ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ + ' @$(ECHO) C','lean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Install info =='#010+ + ' ',' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) DateStr.............. $','(DATESTR)'#010+ + ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ - ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ + ' @$(ECHO) ZipCrossPrefix....','... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO',') FullZipName.......... $(FULLZIPNAME)'#010+ + ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#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 source dir.','.. $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ - ' ','@$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ + ' @$(ECHO) 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) Di','st destination dir. $(DIST_DESTDIR)'#010+ + ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ '#####################################################################'#010+ '# Info rules'#010+ - '#####################################################################'#010+ + '###################################','#################################'+ + '#'#010+ #010+ '.PHONY: fpc_info'#010+ #010+ 'fpc_info: $(INFORULES)'#010+ #010+ - '[makefilerul','es]'#010+ + '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ - '#####################################################################'#010+ + '#########################################################','###########'+ + '#'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ ' \'#010+ - ' ',' fpc_makefile_dirs'#010+ + ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ - 'T_DIRS))'#010+ + ' $(FPCMAKE) -w -T','$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ + 'GET_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' ',' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ - 'GET_EXAMPLEDIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ + 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ - 'EXAMPLEDIRS))'#010+ + 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) ','$(TARGE'+ + 'T_EXAMPLEDIRS))'#010+ #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ - 'fpc_makefi','les: fpc_makefile fpc_makefile_dirs'#010+ + 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ '# Local Makefile'#010+ - '#####################################################################'#010+ + '##########','##########################################################'+ + '#'#010+ #010+ - 'ifneq ($(wildcard fpcmake.loc','),)'#010+ + 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ @@ -2469,20 +2471,20 @@ const fpcmakeini : array[0..259,1..240] of char=( '[userrules]'#010+ '#####################################################################'#010+ '# Users rules'#010+ - '#####################################################################'#010+ + '######################','##############################################'+ + '#'#010+ #010+ '[lclrules]'#010+ - '##############################','######################################'+ - '#'#010+ + '#####################################################################'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ #010+ '# LCL Platform'#010+ - 'ifndef LCL_PLATFORM'#010+ - 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ + 'ifndef LCL_P','LATFORM'#010+ + 'ifneq ($(filter $(OS_TARGET),win32 win64),)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ - 'LCL_PLATFO','RM=gtk'#010+ + 'LCL_PLATFORM=gtk'#010+ 'endif'#010+ 'endif'#010+ 'export LCL_PLATFORM'#010+ @@ -2490,55 +2492,55 @@ const fpcmakeini : array[0..259,1..240] of char=( '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ - 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'ifeq ($(wildcard $','(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ - 'override LCLDIR=wro','ng'#010+ + 'override LCLDIR=wrong'#010+ 'endif'#010+ #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+ + 'ifeq ($(wildcard $(LCLDIR)/units/$','(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Check for development version'#010+ - 'i','feq ($(LCLDIR),wrong)'#010+ + 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ - ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR))',')))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Check for release version'#010+ - 'i','feq ($(LCLDIR),wrong)'#010+ + 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ - ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /us','r))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LC','LUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL'+ - 'DIR)/units)'#010+ + 'override LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDI'+ + 'R)/units)'#010+ 'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../componen'+ - 'ts $(LCLDIR)/components)'#010+ + 'ts $(LCLDIR)/co','mponents)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override R','EQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ + 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ - '#####################################################################'#010+ - '# LCL Info rules'#010+ - '#########################################################','###########'+ + '##########################################################','##########'+ '#'#010+ + '# LCL Info rules'#010+ + '#####################################################################'#010+ 'override INFORULES+=lclinfo'#010+ #010+ '.PHONY: lclinfo'#010+ @@ -2546,23 +2548,23 @@ const fpcmakeini : array[0..259,1..240] of char=( 'lclinfo:'#010+ ' @$(ECHO) == LCL info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ + ' @$(ECHO) Platform..........','... $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO)',' LCL Unit dir......... $(LCLUNITDIR)'#010+ + ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010+ #010+ '[fpmakeprerules]'#010+ - '#####################################################################'#010+ - '# fpmake prerules'#010+ - '####################','################################################'+ + '######################','##############################################'+ '#'#010+ + '# fpmake prerules'#010+ + '#####################################################################'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ 'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+ - 'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+ + 'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMA','KEBIN)'#010+ #010+ '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ - 'd --cpu para','meters'#010+ + 'd --cpu parameters'#010+ 'ifdef OS_TARGET'#010+ 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ 'endif'#010+ @@ -2570,88 +2572,87 @@ const fpcmakeini : array[0..259,1..240] of char=( 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ - '# Get the location of the bootstrap-fpmkunit units'#010+ - 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wi','l'+ - 'dcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ + '# Get the location of the bootstr','ap-fpmkunit units'#010+ + 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+ + 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ - 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ - ')'#010+ + 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SO','URCESUFF'+ + 'IX)'#010+ 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ - 'FPMKUNIT_SRC=$','(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ + 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ 'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ 'endif'#010+ #010+ 'ifdef FPMAKE_SKIP_CONFIG'#010+ - 'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+ + 'override FPMAKE_BUILD_OPT+=$(FP','MAKE_SKIP_CONFIG)'#010+ 'endif'#010+ #010+ '[fpmakerules]'#010+ - '###############################################','#####################'+ - '#'#010+ + '#####################################################################'#010+ '# fpmake rules'#010+ '#####################################################################'#010+ - '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+ - 'pleinstall'#010+ + '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake','_install fpc_fpmake_ex'+ + 'ampleinstall'#010+ #010+ - '# Do not pass the Makefile'#039's unit and binary targe','t 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+ + '# Compose general fpmake-pa','rameters'#010+ 'ifdef FPMAKEOPT'#010+ 'FPMAKE_OPT+=$(FPMAKEOPT)'#010+ 'endif'#010+ - 'FPMAKE_OPT+=--localunitdir=$(F','PCDIR)'#010+ + 'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+ 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+ 'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+ 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+ 'FPMAKE_OPT+=--compiler=$(FPC)'#010+ - 'FPMAKE_OPT+=-bu'#010+ + 'FP','MAKE_OPT+=-bu'#010+ #010+ 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ - 'ifdef UNIXHier'#010, + 'ifdef UNIXHier'#010+ 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+ 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+ 'ON)'#010+ 'else'#010+ - 'FPMAKE_INSTALL_OPT+=--prefix=$(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 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+ + 'pmake, it wi','ll'#010+ '# most often fail because the dependencies are cleared.'#010+ - '# In case of a clean, simpl','y do nothing'#010+ + '# In case of a clean, simply do nothing'#010+ 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+ 'override CLEANTARGET+=fpc_fpmake_clean'#010+ 'endif'#010+ #010+ '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ - ' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+ - 'T=,$(FPMAKE_BUILD_OPT))'#010+ + ' $(MAKE) -C ','$(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix '+ + 'OPT=,$(FPMAKE_BUILD_OPT))'#010+ #010+ - '$(FPMAKEBIN): ','fpmake.pp $(FPMKUNIT_PPU)'#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+ + ' ',' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ - ' ',' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ + ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_install: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+ 'PT)'#010+ #010+ - '# This is not completely valid. Exampleinstall should only install the'+ - ' examples, while'#010+ - '# f','pmake -ie installs everything, including the examples. This also '+ - 'means that on'#010+ + '# Th','is is not completely valid. Exampleinstall should only install t'+ + 'he 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_exampleinstall: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INST', - 'ALL_OPT)'#010 + 'fpc_fpmake_exampleinsta','ll: $(FPMAKEBIN)'#010+ + ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ + 'LL_OPT)'#010 );