From ce8643a2bca9163f2530f802e9c47adbad804c0f Mon Sep 17 00:00:00 2001 From: Nikolay Nikolov Date: Thu, 27 Feb 2025 13:13:39 +0200 Subject: [PATCH] * update fpcmake.inc --- utils/fpcm/fpcmake.inc | 355 +++++++++++++++++++++-------------------- 1 file changed, 178 insertions(+), 177 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index a766be9dc4..6f8df30b5b 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -1393,13 +1393,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'OEXT=.rel'#010+ 'endif'#010+ #010+ - '# WASI'#010+ - 'ifeq ($(OS_TARGET),wasi)'#010+ + '# WASIp1'#010+ + 'ifeq ($(OS_TARGET),wasip1)'#010+ 'EXEEXT=.wasm'#010+ 'endif'#010+ #010+ #010+ - '# For 8.3 limited OS'#039's the short suff','ixes'#010+ + '# For 8.3 limited OS'#039's the short ','suffixes'#010+ '# Otherwise use the full source/target names'#010+ 'ifneq ($(filter $(OS_SOURCE),$(LIMIT83fs)),)'#010+ 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ @@ -1408,7 +1408,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ZIPSOURCESUFFIX=src'#010+ 'ZIPEXAMPLESUFFIX=exm'#010+ 'else'#010+ - 'FPCMADE=fpcmade.$(TARGETSUF','FIX)'#010+ + 'FPCMADE=fpcmade.$(TARGE','TSUFFIX)'#010+ 'ZIPSOURCESUFFIX=.source'#010+ 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ @@ -1421,7 +1421,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '[defaulttools]'#010+ - '##############################','######################################'+ + '##########################','##########################################'+ '#'#010+ '# Default Tools'#010+ '#####################################################################'#010+ @@ -1429,8 +1429,8 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ - 'ARNAME=$(BINUTILSPREFIX)ar'#010+ - 'RC','NAME=$(BINUTILSPREFIX)rc'#010+ + 'ARNAME=$(BINUTILSPREFIX)a','r'#010+ + 'RCNAME=$(BINUTILSPREFIX)rc'#010+ 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ @@ -1442,7 +1442,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# linker, but probably not u','sed'#010+ + '# linker, but probably n','ot used'#010+ 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ @@ -1457,8 +1457,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'RCPROG=$(RCNAME)'#010+ + 'end','if'#010+ 'endif'#010+ - 'e','ndif'#010+ #010+ '# Archiver'#010+ 'ifndef ARPROG'#010+ @@ -1472,7 +1472,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# NASM assembler, redefine it if cross compiling'#010+ 'ifndef NASMPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'NASMPROG=$(CROSSBINDIR)/$(NAS','MNAME)$(SRCEXEEXT)'#010+ + 'NASMPROG=$(CROSSBINDIR)/$','(NASMNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'NASMPROG=$(NASMNAME)'#010+ 'endif'#010+ @@ -1489,8 +1489,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef inUnix'#010+ 'PPAS=./ppas$(SRCBATCHEXT)'#010+ 'else'#010+ - 'PPAS=ppas$(SRCBATCHEXT)'#010+ - 'end','if'#010+ + 'PPAS=ppas$(SRCBATCHEXT)',#010+ + 'endif'#010+ #010+ '# ldconfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ @@ -1511,8 +1511,8 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Tar options'#010+ 'ifeq ($(USETAR),bz2)'#010+ - 'TAROPT=vj'#010+ - 'TAR','EXT=.tar.bz2'#010+ + 'TAROPT=vj',#010+ + 'TAREXT=.tar.bz2'#010+ 'else'#010+ 'TAROPT=vz'#010+ 'TAREXT=.tar.gz'#010+ @@ -1524,7 +1524,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load c','ommandline OPTDEF and add FPC_CPU define, for compiling the'#010+ + '# Lo','ad commandline 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+ @@ -1532,7 +1532,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ - 'ifneq ($(OS_TARGET),$(OS_SOU','RCE))'#010+ + 'ifneq ($(OS_TARGET),$(OS','_SOURCE))'#010+ 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ @@ -1543,7 +1543,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ - 'override FP','MAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ + 'overrid','e FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ @@ -1555,7 +1555,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# When BINUTILSPREFIX is given a','nd we are not cross-compiling then u'+ + '# When BINUTILSPREFIX is giv','en and we are not cross-compiling then u'+ 'se'#010+ '# it while compiling the fpmake file. (For example to build i386-freeb'+ 'sd'#010+ @@ -1563,7 +1563,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ - 'override F','PMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ + 'overri','de FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1573,8 +1573,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ - 'endif'#010+ - 'ifde','f OBJDIR'#010+ + 'endif'#010, + 'ifdef OBJDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ @@ -1588,7 +1588,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Smartlinking creation'#010+ 'ifdef CREATESMART'#010+ - 'override FPCOPT+','=-CX'#010+ + 'override FPC','OPT+=-CX'#010+ 'endif'#010+ #010+ '# Debug'#010+ @@ -1602,7 +1602,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef RELEASE'#010+ 'FPCCPUOPT:=-O2'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ - 'override FPCOPTDEF+=RELEAS','E'#010+ + 'override FPCOPTDEF+=RE','LEASE'#010+ 'endif'#010+ #010+ '# Strip'#010+ @@ -1621,7 +1621,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Needed compiler options'#010+ - 'ifdef COMPILER_OPTI','ONS'#010+ + 'ifdef COMPILER_','OPTIONS'#010+ 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ @@ -1630,7 +1630,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef COMPILER_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ - 'ifdef COMPILER_OBJECT','DIR'#010+ + 'ifdef COMPILER_OB','JECTDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ @@ -1640,17 +1640,17 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Cross compiler utils'#010+ 'ifdef CROSSBINDIR'#010+ 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ - 'endif'#010+ + 'endi','f'#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+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ + 'endif'#010, 'endif'#010+ - 'endi','f'#010+ #010+ '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ @@ -1658,7 +1658,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPREFIX=$(COMPILER_UNIT','TARGETDIR)/'#010+ + 'override UNITTARGETDIRPREFIX=$(COMPILER_','UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ @@ -1670,13 +1670,13 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef SYSROOTPATH'#010+ 'override FPCOPT+=-XR$(SYSROOTPATH)'#010+ 'else'#010+ - '# if we are compili','ng natively on aarch64-darwin and if -/Library/De'+ + '# if we are com','piling natively on aarch64-darwin and if -/Library/De'+ 'veloper/CommandLineTools/SDKs/MacOSX.sdk exists,'#010+ '# add it to the compiler command line'#010+ 'ifeq ($(OS_TARGET),$(OS_SOURCE))'#010+ 'ifeq ($(OS_TARGET),darwin)'#010+ '# so far the only tested one'#010+ - 'ifeq ($(CPU_TAR','GET),aarch64)'#010+ + 'ifeq ($(CPU','_TARGET),aarch64)'#010+ 'ifneq ($(wildcard /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk)'+ ',)'#010+ 'override FPCOPT+=-XR/Library/Developer/CommandLineTools/SDKs/MacOSX.sd'+ @@ -1689,14 +1689,14 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'ifdef CREATESHARED'#010+ 'override FPCOPT+=-Cg'#010+ - 'endif'#010+ + 'endif'#010, #010+ - '# c','reate always pic'#039'ed code on x86_64, mips and mipsel'#010+ + '# create always pic'#039'ed code on x86_64, mips and mipsel'#010+ '# on unix-like systems'#010+ 'ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux so'+ 'laris),)'#010+ 'ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv'+ - '64 powerpc64),)'#010, + '64 powerpc64','),)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ @@ -1711,7 +1711,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ #010+ - '[command_l','ibc]'#010+ + '[comma','nd_libc]'#010+ '# Add GCC lib path if asked'#010+ 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ @@ -1722,7 +1722,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(','addprefix -Fl,$(OTHERLIBDIR))'#010+ + 'override FPCOPT','+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ @@ -1733,7 +1733,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Override options to compile the fpmake-binary with command-line opti'+ - 'ons provided in FPMAKEBUI','LDOPT'#010+ + 'ons provided in FPMAK','EBUILDOPT'#010+ 'ifdef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ 'endif'#010+ @@ -1745,7 +1745,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'overrid','e FPCOPT+=@$(CFGFILE)'#010+ + 'ove','rride FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ '# Use the environment to pass commandline options?'#010+ @@ -1756,7 +1756,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'override AFULL_S','OURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ + 'override AFU','LL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ @@ -1769,15 +1769,15 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Compiler commandline'#010+ 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ #010+ - '# also ca','ll ppas if with command option -s'#010+ + '# als','o 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 (,$(filter -sh,$(COMPILER)))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ 'ifneq (,$(filter -s,$(COMPILER)))'#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ - 'UseE','XECPPAS=1'#010+ + 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010, + 'UseEXECPPAS=1'#010+ 'endif'#010+ 'endif'#010+ 'ifneq ($(UseEXECPPAS),1)'#010+ @@ -1793,7 +1793,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '[loaderrules]'#010+ '#####################################################################'#010+ - '# Loaders'#010, + '# Load','ers'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ @@ -1802,8 +1802,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ - #010+ - 'over','ride LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + #010, + 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ @@ -1813,7 +1813,7 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPILER_','UNITTARGETDIR) $(LOADEROFILES)'#010+ + 'fpc_loaders: $(COMPI','LER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ @@ -1824,7 +1824,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ - ' $(MKDIR) $(INST','ALL_UNITDIR)'#010+ + ' $(MKDIR) $(','INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#010+ @@ -1834,7 +1834,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[unitrules]'#010+ - '#########################','###########################################'+ + '#####################','###############################################'+ '#'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -1844,11 +1844,11 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFI','LES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ + 'override UNITP','PUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNIT','PPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICIT','UNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ @@ -1859,24 +1859,24 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Exes'#010+ '#####################################################################'#010+ #010+ - '.PHONY: f','pc_exes'#010+ + '.PHON','Y: 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)) $(addsuffi'+ - 'x ','$(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(adds'+ - 'uffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREF'+ - 'IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ - 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TA','RGET_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+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOU','TEXT),$(TARGET_PROGRAMS))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $','(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1888,7 +1888,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '###############','#####################################################'+ + '###########','#########################################################'+ '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ @@ -1896,7 +1896,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRSTFIL','ES+=$(RSTFILES)'#010+ + 'override CLEANRS','TFILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ @@ -1907,22 +1907,22 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifneq ($(TARGET_EXAMPLES),)',#010+ + 'ifneq ($(TARGET_EXAMPLE','S),)'#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 $(E','XEEXT),$(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 $(IMPORTLIBP'+ - 'REF','IX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ + 'ddsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLIB', + 'PREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ #010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ - 'ifeq ($(OS_T','ARGET),os2)'#010+ + 'ifeq ($(','OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ @@ -1931,8 +1931,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ 'HASEXAMPLES=1'#010+ - 'endif'#010+ - #010, + 'end','if'#010+ + #010+ 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ 'S))'#010+ #010+ @@ -1940,7 +1940,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '[compilerules]'#010+ '#####################################################################'#010+ '# General compile rules'#010+ - '#######################################################','#############'+ + '###################################################','#################'+ '#'#010+ #010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ @@ -1951,7 +1951,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'fpc_all: $(FPCMADE)'#010+ #010+ 'fpc_smart:'#010+ - ' $(MAKE) all LINKSMART=1 CREATESMART','=1'#010+ + ' $(MAKE) all LINKSMART=1 CREATES','MART=1'#010+ #010+ 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ @@ -1962,8 +1962,8 @@ const fpcmakeini : array[0..268,1..240] of char=( '# General compile rules, available for both possible .pp and .pas exte'+ 'nsions'#010+ #010+ - '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+ - 'c .r','es'#010+ + '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r', + 'c .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ @@ -1976,7 +1976,7 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ - ' $(COMPI','LER) $<'#010+ + ' $(C','OMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ @@ -1992,7 +1992,7 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.dpr'#010+ - ' ','$(COMPILER) $<'#010+ + ' ',' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ '%.res: %.rc'#010+ @@ -2000,13 +2000,13 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpa','th %.lpr $(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 %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+ - 'vpath %$(P','PUEXT) $(COMPILER_UNITTARGETDIR)'#010+ + 'vpath ','%$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ @@ -2015,7 +2015,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ '.PHONY: fpc_shared'#010+ #010+ - 'override INSTALLTARGE','T+=fpc_shared_install'#010+ + 'override INSTALLT','ARGET+=fpc_shared_install'#010+ #010+ 'ifndef SHARED_LIBVERSION'#010+ 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ @@ -2026,8 +2026,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'ifndef SHARED_FULLNAME'#010+ - 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSI', - 'ON)$(SHAREDLIBEXT)'#010+ + 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBV','ERS'+ + 'ION)$(SHAREDLIBEXT)'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ @@ -2035,14 +2035,14 @@ const fpcmakeini : array[0..268,1..240] of char=( 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ - 'endif'#010+ - #010, + 'end','if'#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+ + 'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)',' -P$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'else'#010+ ' @$(ECHO) Shared Libraries not supported'#010+ @@ -2052,7 +2052,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifneq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ - ' $(INSTALL',') $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+ + ' $(INS','TALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(IN'+ 'STALL_SHAREDDIR)'#010+ 'endif'#010+ 'endif'#010+ @@ -2061,7 +2061,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '[installrules]'#010+ '#####################################################################'#010+ '# Install rules'#010+ - '####################################################','################'+ + '################################################','####################'+ '#'#010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ @@ -2071,37 +2071,37 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ - 'override INSTALLPPUFILES:=$(filter-out $(INSTA','LL_BUILDUNIT)$(PPUEXT)'+ + 'override INSTALLPPUFILES:=$(filter-out $(I','NSTALL_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),$(STATICLIB','PREFIX)-$(STATI'+ + 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATI','CLIBPREFIX)-$(STATI'+ 'CLIBEXT))'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+ 'ATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))) '+ - '$(add','prefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ + '$','(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+ 'NSTALLPPUFILES)))'#010+ 'else'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+ - 'ATICLIBPREFIX)',',$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ + 'ATICLIBPRE','FIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+ ')'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ 'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+ 'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+ - 'override INSTALLPPU','FILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTAL'+ + 'override INSTAL','LPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTAL'+ 'LPPUFILENAMES))'#010+ 'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPRE'+ 'FIX),$(INSTALLPPULINKFILENAMES)))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ - 'override INSTALL_CREATEPACKAGEFP','C=1'#010+ + 'override INSTALL_CREATEPACKA','GEFPC=1'#010+ 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ @@ -2113,14 +2113,14 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' $(MKDIR) $(INST','ALL_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 a','vailable'#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+ @@ -2129,14 +2129,14 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ - 'i','fdef INSTALLPPUFILES'#010+ + 'end','if'#010+ + 'ifdef INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB_FUL','LNAME)),)'#010+ + 'ifneq ($(wildcard $(LIB','_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ @@ -2145,7 +2145,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FILES'#010+ - ' $(MKDIR) $(INSTALL_DAT','ADIR)'#010+ + ' $(MKDIR) $(INSTALL','_DATADIR)'#010+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ @@ -2153,7 +2153,7 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(adds','uffix _distclean,$'+ + 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(','addsuffix _distclean,$'+ '(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ @@ -2162,14 +2162,15 @@ const fpcmakeini : array[0..268,1..240] of char=( ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $','(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ + ' $(COPYTRE','E) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ '#####################################################################'#010+ '# Dist Install'#010+ - '#####################################################################'#010, + '##################################################################','##'+ + '#'#010+ #010+ '.PHONY: fpc_distinstall'#010+ #010+ @@ -2181,13 +2182,13 @@ const fpcmakeini : array[0..268,1..240] of char=( '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY:',' fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ + '.PH','ONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ - 'PACKDIR=$(BASEDIR)/../fpc-','pack'#010+ + 'PACKDIR=$(BASEDIR)/../','fpc-pack'#010+ 'else'#010+ 'PACKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ @@ -2203,7 +2204,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCROSSPREFIX',')$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ + 'FULLZIPNAME=$(ZIPCROSSPR','EFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ '# ZipTarget'#010+ @@ -2221,8 +2222,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'USETAR=1'#010+ 'endif'#010+ 'endif'#010+ - #010+ - '# Us','e a wrapper script by default for Os/2'#010+ + #010, + '# Use a wrapper script by default for Os/2'#010+ 'ifndef inUnix'#010+ 'USEZIPWRAPPER=1'#010+ 'endif'#010+ @@ -2231,7 +2232,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/','fpczip$(SRCBATCHEXT)'+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTD','IR)/fpczip$(SRCBATCHEXT)'+ ')'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ @@ -2241,7 +2242,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR',')/$(FULLZIPNAME)$(TAREXT)'#010+ + 'ZIPDESTFILE:=$(DIST_DES','TDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ @@ -2249,21 +2250,21 @@ const fpcmakeini : array[0..268,1..240] of char=( 'TFILE) *'#010+ 'endif'#010+ #010+ - 'fpc_zipinstall:'#010+ - ' ',' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ + 'fpc_zipinstall',':'#010+ + ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ - ' $(','ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ + ' ',' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ 'PER)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ - ' echo $(ZIPCMD_CDPAC','K) > $(ZIPWRAPPER)'#010+ + ' echo $(ZIPCMD_C','DPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ @@ -2273,7 +2274,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef RUNBATCH'#010+ ' $(RUNBATCH) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPWRAPPER)'#010, + ' $(ZIPWRAPP','ER)'#010+ 'endif'#010+ 'endif'#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ @@ -2284,7 +2285,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ - 'SOURC','ESUFFIX)'#010+ + 'S','OURCESUFFIX)'#010+ #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ @@ -2297,7 +2298,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[cleanrules]'#010+ - '########','############################################################'+ + '####','################################################################'+ '#'#010+ '# Clean rules'#010+ '#####################################################################'#010+ @@ -2305,7 +2306,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(addpre','fix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ + 'override CLEANEXEFILES:=$(ad','dprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ 'ES))'#010+ 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ 'GFILES))'#010+ @@ -2313,7 +2314,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'ifdef CLEAN_PROGRAMS'#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ - 'XEEXT), $(CLEAN_PROGRA','MS)))'#010+ + 'XEEXT), $(CLEAN_PR','OGRAMS)))'#010+ 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ @@ -2323,17 +2324,17 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPP','ULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'override CLE','ANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ 'S)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATIC'+ 'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+ - 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STA','TICLIBEXT),$(CLEANPP'+ + 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$','(STATICLIBEXT),$(CLEANPP'+ 'UFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'UFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+ - 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CL','EANPPU'+ + 'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),','$(CLEANPPU'+ 'FILENAMES))'#010+ 'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+ 'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+ @@ -2342,7 +2343,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) ','$(CLEANEXEFILES)'#010+ + ' -$(D','EL) $(CLEANEXEFILES)'#010+ 'endif'#010+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+ 'ifdef CLEANEXEDBGFILES'#010+ @@ -2351,7 +2352,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKF','ILES),)'#010+ + 'ifneq ($(CLEANPPUL','INKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ @@ -2361,12 +2362,12 @@ const fpcmakeini : array[0..268,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NA','ME) $(LIB_FULLNAME)'#010+ + ' -$(DEL) $(LI','B_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$(BATCHEX','T) ppaslink$('+ + ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BAT','CHEXT) ppaslink$('+ 'BATCHEXT)'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET)'#010+ @@ -2378,7 +2379,7 @@ const fpcmakeini : array[0..268,1..240] of char=( ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$','(DEL) $(CLEANPPULINKFILES)'#010+ + ' ',' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -2388,14 +2389,14 @@ const fpcmakeini : array[0..268,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ - ' -$(DELTREE) bin'#010+ - ' ',' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT)'+ - ' *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DELTREE) b','in'#010+ + ' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+ + '$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) fpcmade.* Package.f','pc *.fpm'#010+ + ' -$(DEL) fpcmade.* Packa','ge.fpc *.fpm'#010+ ' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+ 'ipt.res *_link.res'#010+ ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+ @@ -2403,7 +2404,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ - 'ifdef DEBUGSYMEX','T'#010+ + 'ifdef DEBUGS','YMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ 'ifdef LOCALFPMAKEBIN'#010+ @@ -2415,7 +2416,7 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '################################################################','####'+ + '############################################################','########'+ '#'#010+ '# Base info rules'#010+ '#####################################################################'#010+ @@ -2427,37 +2428,37 @@ const fpcmakeini : array[0..268,1..240] of char=( 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ - ' @$(ECHO) Pac','kage Name..... $(PACKAGE_NAME)'#010+ + ' @$(ECHO) ',' Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+ - ' @$(ECHO) FPC Version.. $(FPC_','VERSION)'#010+ + ' @$(ECHO) FPC Version.. $(','FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ - ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ - ' ',' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ + ' @$(ECHO) Full Source.. $(FULL_SOURCE',')'#010+ + ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Directory info =','='#010+ + ' @$(ECHO) == Directory in','fo =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ - ' ','@$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ + ' ',' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) =','= Tools info =='#010+ + ' @$(ECHO',') == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ @@ -2465,54 +2466,54 @@ const fpcmakeini : array[0..268,1..240] of char=( ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ - ' @$(','ECHO) Cp........ $(CPPROG)'#010+ + ' ',' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ - ' @$(ECHO) FP','CMake... $(FPCMAKE)'#010+ + ' @$(ECHO)',' FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ - ' @$(','ECHO) 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 Dirs........... $(TARGET_DIRS)'#010+ - ' @$(EC','HO) 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) 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)'#010+ - ' @$(ECHO) DateStr.............. $(DAT','ESTR)'#010+ + ' @$(ECHO) DateStr.............. $','(DATESTR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) F','ullZipName.......... $(FULLZIPNAME)'#010+ + ' @$(ECHO',') FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ - ' ','@$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ + ' ',' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ - ' @$(E','CHO) 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)'#010+ + ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME',')'#010+ + ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ '#####################################################################'#010+ @@ -2523,14 +2524,14 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_info: $(INFORULES)'#010+ #010+ - '[makefilerules]'#010, + '[makefilerul','es]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#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+ @@ -2541,7 +2542,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' ','$(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ + ' ',' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ 'GET_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ @@ -2550,14 +2551,14 @@ const fpcmakeini : array[0..268,1..240] of char=( #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ - 'fpc_makefiles:',' fpc_makefile fpc_makefile_dirs'#010+ + 'fpc_makefi','les: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ #010+ - 'ifneq ($(wildcard fpcmake.loc),)'#010, + 'ifneq ($(wildcard fpcmake.loc','),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ @@ -2568,7 +2569,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '##################################','##################################'+ + '##############################','######################################'+ '#'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ @@ -2578,8 +2579,8 @@ const fpcmakeini : array[0..268,1..240] of char=( 'ifneq ($(filter $(OS_TARGET),win32 win64),)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ - 'LCL_PLATFORM=gtk'#010+ - 'e','ndif'#010+ + 'LCL_PLATFORM=g','tk'#010+ + 'endif'#010+ 'endif'#010+ 'export LCL_PLATFORM'#010+ #010+ @@ -2591,7 +2592,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ 'else'#010+ 'override LCLDIR=wrong'#010+ - 'endif',#010+ + 'e','ndif'#010+ #010+ '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ @@ -2602,7 +2603,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Check for development version'#010+ - 'ifeq ($(L','CLDIR),wrong)'#010+ + 'ifeq ','($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ @@ -2611,7 +2612,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Check for release version'#010+ - 'ifeq ($(L','CLDIR),wrong)'#010+ + 'ifeq ','($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ @@ -2620,20 +2621,20 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR','=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL'+ + 'override LCLUNI','TDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCL'+ 'DIR)/units)'#010+ 'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../componen'+ 'ts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQUIRE_P','ACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ + 'override REQUI','RE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '#################################################################','###'+ + '#############################################################','#######'+ '#'#010+ 'override INFORULES+=lclinfo'#010+ #010+ @@ -2644,22 +2645,22 @@ const fpcmakeini : array[0..268,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO) LCL Un','it dir......... $(LCLUNITDIR)'#010+ + ' @$(ECHO) LC','L Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010+ #010+ '[fpmakeprerules]'#010+ '#####################################################################'#010+ '# fpmake prerules'#010+ - '############################','########################################'+ + '########################','############################################'+ '#'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ 'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+ 'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+ #010+ '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ - 'd --cpu parameters'#010+ - 'i','fdef OS_TARGET'#010+ + 'd --cpu paramete','rs'#010+ + 'ifdef OS_TARGET'#010+ 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ 'endif'#010+ 'ifdef CPU_TARGET'#010+ @@ -2670,12 +2671,12 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '# Get the location of the bootstrap-fpmkunit units'#010+ - 'PACKAGEDIR_F','PMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wi'+ + 'PACKAGED','IR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wi'+ 'ldcard $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ ')'#010+ - 'override COMPILER_','FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ + 'override COMPI','LER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ 'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ 'endif'#010+ @@ -2684,12 +2685,12 @@ const fpcmakeini : array[0..268,1..240] of char=( 'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+ 'endif'#010+ #010+ - '[fpma','kerules]'#010+ + '[','fpmakerules]'#010+ '#####################################################################'#010+ '# fpmake rules'#010+ '#####################################################################'#010+ '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+ - 'pleins','tall'#010+ + 'pl','einstall'#010+ #010+ '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+ 'ake uses it'#039's own.'#010+ @@ -2697,7 +2698,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+ '# Compose general fpmake-parameters'#010+ 'ifdef FPMAKEOPT'#010+ - 'FPMAK','E_OPT+=$(FPMAKEOPT)'#010+ + 'F','PMAKE_OPT+=$(FPMAKEOPT)'#010+ 'endif'#010+ 'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+ 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+ @@ -2705,7 +2706,7 @@ const fpcmakeini : array[0..268,1..240] of char=( 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+ 'FPMAKE_OPT+=--compiler=$(FPC)'#010+ 'FPMAKE_OPT+=-bu'#010+ - 'ifdef FPC_DOTTED','UNITS'#010+ + 'ifdef FPC_DO','TTEDUNITS'#010+ 'FPMAKE_OPT+=-ns'#010+ 'endif'#010+ #010+ @@ -2715,14 +2716,14 @@ const fpcmakeini : array[0..268,1..240] of char=( 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+ 'ON)'#010+ 'else'#010+ - 'FPMAKE_INSTALL','_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+ + 'FPMAKE_INS','TALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ 'override ALLTARGET+=fpc_fpmake'#010+ 'override INSTALLTARGET+=fpc_fpmake_install'#010+ 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+ - '# If no fpmake exists and (dist)clean is called, do not try to build',' '+ - 'fpmake, it will'#010+ + '# If no fpmake exists and (dist)clean is called, do not try to b','uild'+ + ' fpmake, it will'#010+ '# most often fail because the dependencies are cleared.'#010+ '# In case of a clean, simply do nothing'#010+ 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+ @@ -2730,21 +2731,21 @@ const fpcmakeini : array[0..268,1..240] of char=( 'endif'#010+ #010+ '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ - ' ',' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix '+ + ' ',' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix '+ 'OPT=,$(FPMAKE_BUILD_OPT))'#010+ #010+ '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+ ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+ 'IR)) $(FPMAKE_BUILD_OPT)'#010+ #010+ - 'fpc_fpmake: $(FPMA','KEBIN)'#010+ + 'fpc_fpmake: $(','FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ #010+ 'fpc_fpmake_install: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INST','ALL'+ + ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_','INSTALL'+ '_OPT)'#010+ #010+ '# This is not completely valid. Exampleinstall should only install the'+ @@ -2752,7 +2753,7 @@ const fpcmakeini : array[0..268,1..240] of char=( '# fpmake -ie installs everything, including the examples. This also me'+ 'ans that on'#010+ '# a distinstall fpmake install wil be called twice.'#010+ - 'fpc_fpmak','e_exampleinstall: $(FPMAKEBIN)'#010+ + 'fpc_f','pmake_exampleinstall: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ 'LL_OPT)'#010 );