From a88a0f61af163653d6150d34a2a684f45b6e3541 Mon Sep 17 00:00:00 2001 From: pierre Date: Mon, 21 Sep 2020 14:04:17 +0000 Subject: [PATCH] Regenerated after commit #46866 git-svn-id: branches/fixes_3_2@46910 - --- utils/fpcm/fpcmake.inc | 775 +++++++++++++++++++++-------------------- 1 file changed, 388 insertions(+), 387 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index c9b3315531..64f25765c2 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -475,11 +475,11 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Default binutils prefix for cross compile when the'#010+ '# crossbindir is not set (except for Darwin)'#010+ - 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+ - 'ifeq ($(OS_SOURCE),darwin)'#010+ - 'DARWIN2DARWIN=1'#010+ + 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)'#010+ + 'ifneq ($(findstring $(OS_SOURCE),darwin ios),)'#010+ + 'DA','RWIN2DARWIN=1'#010+ + 'endif'#010+ 'endif'#010+ - 'endi','f'#010+ #010+ 'ifndef BINUTILSPREFIX'#010+ 'ifndef CROSSBINDIR'#010+ @@ -489,8 +489,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifneq ($(CPU_TARGET),jvm)'#010+ 'BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-'#010+ #010+ - '# For Android use standard NDK prefixes'#010+ - 'ifeq ($(OS_TARGET),','android)'#010+ + '# For Android use standard NDK pref','ixes'#010+ + 'ifeq ($(OS_TARGET),android)'#010+ 'ifeq ($(CPU_TARGET),arm)'#010+ 'BINUTILSPREFIX=arm-linux-androideabi-'#010+ 'else'#010+ @@ -503,9 +503,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ 'endif'#010+ - 'endif'#010+ + 'endi','f'#010+ 'else'#010+ - 'BINUTILSPREFIX=$(','OS_TARGET)-'#010+ + 'BINUTILSPREFIX=$(OS_TARGET)-'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -515,7 +515,7 @@ const fpcmakeini : array[0..243,1..240] of char=( '# the OS for backwards compatibility'#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+ 'ifeq ($(UNITSDIR),)'#010+ - 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(','OS_TARGET))'#010+ + 'UNITSDIR:=$(wil','dcard $(FPCDIR)/units/$(OS_TARGET))'#010+ 'endif'#010+ #010+ '# Packages dir'#010+ @@ -525,7 +525,7 @@ const fpcmakeini : array[0..243,1..240] of char=( '[shelltools]'#010+ '#####################################################################'#010+ '# Shell tools'#010+ - '#####################################################','###############'+ + '#############################','#######################################'+ '#'#010+ #010+ '# Echo that can redir (must be able run in the default OS shell)'#010+ @@ -540,9 +540,9 @@ const fpcmakeini : array[0..243,1..240] of char=( '# To copy pograms'#010+ 'ifndef COPY'#010+ 'COPY:=$(CPPROG) -fp'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ - '# Copy a whole tre','e'#010+ + '# Copy a whole tree'#010+ 'ifndef COPYTREE'#010+ 'COPYTREE:=$(CPPROG) -Rfp'#010+ 'endif'#010+ @@ -559,10 +559,10 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Check delete program'#010+ 'ifndef DEL'#010+ - 'DEL:=$(RMPROG) -f'#010+ + 'DEL:=','$(RMPROG) -f'#010+ 'endif'#010+ #010+ - '# Ch','eck deltree program'#010+ + '# Check deltree program'#010+ 'ifndef DELTREE'#010+ 'DELTREE:=$(RMPROG) -rf'#010+ 'endif'#010+ @@ -577,9 +577,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ '# To install programs'#010+ - 'ifndef INSTALLEXE'#010+ + 'ifndef INSTALLEX','E'#010+ 'ifdef inUnix'#010+ - 'INSTALLEX','E:=$(GINSTALL) -c -m 755'#010+ + 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ 'endif'#010+ @@ -594,18 +594,17 @@ const fpcmakeini : array[0..243,1..240] of char=( 'IR'#010+ #010+ #010+ - '[defaultdirs]'#010+ - '################','####################################################'+ - '#'#010+ + '[defau','ltdirs]'#010+ + '#####################################################################'#010+ '# Default Directories'#010+ '#####################################################################'#010+ #010+ '# Units dir'#010+ 'ifdef REQUIRE_UNITSDIR'#010+ - 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ + 'override UNITSDIR+=$(REQUIRE_UNITS','DIR)'#010+ 'endif'#010+ #010+ - '# Units dir'#010, + '# Units dir'#010+ 'ifdef REQUIRE_PACKAGESDIR'#010+ 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ 'endif'#010+ @@ -613,8 +612,8 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+ '# When zipping use the target os default, when normal install then'#010+ - '# use the source os as default'#010+ - 'ifdef ZIPINSTALL',#010+ + '# use the source os as ','default'#010+ + 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ @@ -626,8 +625,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# When install prefix is not set try to use prefix'#010+ - 'ifndef INSTALL_PREFIX'#010, + '# When install prefix is not set try to use prefi','x'#010+ + 'ifndef INSTALL_PREFIX'#010+ 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ 'endif'#010+ @@ -639,9 +638,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'INSTALL_PREFIX=/usr/local'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_BASEDIR:=/pp'#010+ + 'INSTALL_BASEDIR:=','/pp'#010+ 'else'#010+ - 'INSTALL_BASEDIR',':=/$(PACKAGE_NAME)'#010+ + 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -653,7 +652,7 @@ const fpcmakeini : array[0..243,1..240] of char=( 'export INSTALL_FPCSUBDIR'#010+ 'endif'#010+ #010+ - '# Where to place the resulting zip f','iles'#010+ + '# Where to p','lace the resulting zip files'#010+ 'ifndef DIST_DESTDIR'#010+ 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ @@ -662,9 +661,9 @@ const fpcmakeini : array[0..243,1..240] of char=( '# EXE/PPU Target directories'#010+ 'ifndef COMPILER_UNITTARGETDIR'#010+ 'ifdef PACKAGEDIR_MAIN'#010+ - 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ + 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSU','FFIX)'#010+ 'else'#010+ - 'COMPILER_UNIT','TARGETDIR=units/$(TARGETSUFFIX)'#010+ + 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ 'ifndef COMPILER_TARGETDIR'#010+ @@ -674,7 +673,7 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '#####################################################################'#010+ '# Install Directories'#010+ - '#################################################','###################'+ + '#########################','###########################################'+ '#'#010+ #010+ '# set the base directory where to install everything'#010+ @@ -683,7 +682,7 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ - 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/','$(PACKAGE_NAME)'#010+ + 'INSTALL_BASEDIR',':=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+ @@ -695,15 +694,15 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifdef UNIXHier'#010+ 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/','bin'#010+ + 'INSTALL_BIN','DIR:=$(INSTALL_BASEDIR)/bin'#010+ '# for FPC packages install the binaries under their target subdir'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef CROSSCOMPILE'#010+ 'ifdef CROSSINSTALL'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+ 'else'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ - 'en','dif'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BI','NDIR)/$(TARGETSUFFIX)'#010+ + 'endif'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ @@ -714,8 +713,8 @@ const fpcmakeini : array[0..243,1..240] of char=( '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ - 'if','def PACKAGE_NAME'#010+ + 'ifd','ef INSTALL_FPCPACKAGE'#010+ + 'ifdef PACKAGE_NAME'#010+ 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ @@ -726,8 +725,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifdef UNIXHier'#010+ 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+ 'else'#010+ - 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ - 'e','ndif'#010+ + 'INSTALL_LIBD','IR:=$(INSTALL_UNITDIR)'#010+ + 'endif'#010+ 'endif'#010+ #010+ '# Where the source files will be stored'#010+ @@ -742,25 +741,25 @@ const fpcmakeini : array[0..243,1..240] of char=( 'SRCPREFIXDIR=src'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ - 'ifdef IN','STALL_FPCSUBDIR'#010+ + 'ifdef INS','TALL_FPCPACKAGE'#010+ + 'ifdef INSTALL_FPCSUBDIR'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ - ')/$(PACKAGE_NAME)'#010+ + ')/$(PACKAGE_NAME',')'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_SOU','RCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+ - '-$(PACKAGE_VERSION)'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ + '(PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+ - 'CKAGE_NAME)'#010+ + 'CKAGE_NAM','E)'#010+ 'else'#010+ - 'INSTALL_SOURCEDI','R:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+ @@ -772,9 +771,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifndef INSTALL_DOCDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef BSDhier'#010+ - 'DOCPREFIXDIR=share/doc'#010+ + 'DOCPREFI','XDIR=share/doc'#010+ 'else'#010+ - 'ifde','f linuxHier'#010+ + 'ifdef linuxHier'#010+ 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ 'DOCPREFIXDIR=doc'#010+ @@ -784,7 +783,7 @@ const fpcmakeini : array[0..243,1..240] of char=( 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ '(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACK','AGE_NAME)-$('+ + 'INSTALL_DOCDIR:=$(INSTALL_PREFIX',')/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$('+ 'PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ @@ -796,16 +795,16 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where to install the examples, under linux we use the d','oc dir'#010+ + '# Where to install the examples, ','under linux we use the doc dir'#010+ '# because the copytree command will create a subdir itself'#010+ 'ifndef INSTALL_EXAMPLEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+ - ')/$(PACKAGE_NAME)'#010+ - 'else'#010, + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSIO', + 'N)/$(PACKAGE_NAME)'#010+ + 'else'#010+ 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ 'else'#010+ @@ -817,7 +816,7 @@ const fpcmakeini : array[0..243,1..240] of char=( 'else'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/','$(PACKAGE_NAME)'+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL','_PREFIX)/share/examples/$(PACKAGE_NAME)'+ '-$(PACKAGE_VERSION)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ @@ -825,12 +824,12 @@ const fpcmakeini : array[0..243,1..240] of char=( 'GE_VERSION)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ - 'RSION)'#010+ + 'RSI','ON)'#010+ 'endif'#010+ #010+ 'endif'#010+ 'endif'#010+ - 'e','lse'#010+ + 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ 'else'#010+ @@ -840,8 +839,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ '# Where the some extra (data)files will be stored'#010+ - 'ifndef INSTALL_DATADIR'#010+ - 'IN','STALL_DATADIR=$(INSTALL_BASEDIR)'#010+ + 'i','fndef INSTALL_DATADIR'#010+ + 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ 'ifndef INSTALL_SHAREDDIR'#010+ @@ -850,14 +849,14 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '#####################################################################'#010+ '# Cross compile dirs'#010+ - '#####################################','###############################'+ + '#############','#######################################################'+ '#'#010+ #010+ 'ifdef CROSSCOMPILE'#010+ '# Directory where the cross compile tools are stored.'#010+ '# First check if they are available in FPCDIR. If no targets/ subdir'#010+ - '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ - 'ifndef CR','OSSBINDIR'#010+ + '# is found use the targets/ subdir in IN','STALL_BASEDIR.'#010+ + 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ @@ -866,11 +865,11 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'else'#010+ 'CROSSBINDIR='#010+ - 'endif'#010+ + 'endif',#010+ #010+ #010+ '[dirlibc]'#010+ - '# On linux,',' try to find where libgcc.a is.'#010+ + '# On linux, try to find where libgcc.a is.'#010+ 'ifeq ($(OS_SOURCE),linux)'#010+ #010+ '# Amd64 to i386?'#010+ @@ -878,7 +877,7 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#010+ 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-lib','gcc-file-name`)'#010+ + 'GCCLIBDIR:=$(shell dirn','ame `gcc -m32 -print-libgcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -891,7 +890,7 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Try cross gcc'#010+ 'ifndef GCCLIBDIR'#010+ - 'CROSSGCC=$(strip $(wildcard $(adds','uffix /$(BINUTILSPREFIX)gcc$(SRCEX'+ + 'CROSSGCC=$','(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+ 'EEXT),$(SEARCHPATH))))'#010+ 'ifneq ($(CROSSGCC),)'#010+ 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ @@ -900,7 +899,7 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Other libraries from ld.so.conf'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBDIR:=$(shell grep -v "','^\#" /etc/ld.so.conf | awk '#039'{ ORS='+ + 'OTHERL','IBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+ '" "; print $1 }'#039')'#010+ 'endif'#010+ 'endif'#010+ @@ -914,7 +913,7 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ #010+ '[extensions]'#010+ - '########################################################','############'+ + '################################','####################################'+ '#'#010+ '# Default extensions'#010+ '#####################################################################'#010+ @@ -925,9 +924,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ 'PPUEXT=.ppu'#010+ - 'OEXT=.o'#010+ + 'OEX','T=.o'#010+ 'ASMEXT=.s'#010+ - 'SMARTEXT=','.sl'#010+ + 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ 'SHAREDLIBPREFIX=libfp'#010+ @@ -936,8 +935,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'RSTEXT=.rst'#010+ '# external debug info for executable'#010+ 'EXEDBGEXT=.dbg'#010+ - '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ - ' ha','s this'#010+ + '#DEBUGSYMEXT #for debugger symbol files, define o','nly for targets whi'+ + 'ch has this'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ @@ -954,9 +953,9 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# watcom'#010+ 'ifeq ($(OS_TARGET),watcom)'#010+ - 'STATICLIBPREFIX='#010+ + 'STAT','ICLIBPREFIX='#010+ 'OEXT=.obj'#010+ - 'A','SMEXT=.asm'#010+ + 'ASMEXT=.asm'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=wat'#010+ 'IMPORTLIBPREFIX='#010+ @@ -973,8 +972,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ '# Linux'#010+ - 'ifeq ($(OS_TARGET),linux)'#010+ - 'B','ATCHEXT=.sh'#010+ + 'ife','q ($(OS_TARGET),linux)'#010+ + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=lnx'#010+ @@ -991,9 +990,9 @@ const fpcmakeini : array[0..243,1..240] of char=( '# FreeBSD'#010+ 'ifeq ($(OS_TARGET),freebsd)'#010+ 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ + 'EXE','EXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHOR','TSUFFIX=fbs'#010+ + 'SHORTSUFFIX=fbs'#010+ 'endif'#010+ #010+ '# NetBSD'#010+ @@ -1012,8 +1011,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'SHORTSUFFIX=obs'#010+ 'endif'#010+ #010+ - '# Win32'#010+ - 'ifeq ($(OS_TARGET),wi','n32)'#010+ + '# Win','32'#010+ + 'ifeq ($(OS_TARGET),win32)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=w32'#010+ 'endif'#010+ @@ -1030,9 +1029,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ '# EMX'#010+ - 'ifeq ($(OS_TARGET),emx)'#010+ + 'ifeq ($(OS_TARGET),em','x)'#010+ 'BATCHEXT=.cmd'#010+ - 'AOUTEXT','=.out'#010+ + 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=emx'#010+ @@ -1049,8 +1048,8 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# AROS'#010+ 'ifeq ($(OS_TARGET),aros)'#010+ - 'EXEEXT='#010+ - 'SHAREDLIBEXT=.library'#010, + 'EXEEXT','='#010+ + 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=aros'#010+ 'endif'#010+ #010+ @@ -1068,10 +1067,10 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ '# BeOS'#010+ - 'ifeq ($(OS_TARGET),beos)'#010+ + 'ifeq ($(OS_TARGET),beos)'#010, 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'SHO','RTSUFFIX=be'#010+ + 'SHORTSUFFIX=be'#010+ 'endif'#010+ #010+ '# Haiku'#010+ @@ -1090,9 +1089,9 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# QNX'#010+ 'ifeq ($(OS_TARGET),qnx)'#010+ - 'BATCHEXT=.sh'#010+ + 'BATCHEX','T=.sh'#010+ 'EXEEXT='#010+ - 'SHORTSUFFI','X=qnx'#010+ + 'SHORTSUFFIX=qnx'#010+ 'endif'#010+ #010+ '# Netware clib'#010+ @@ -1107,12 +1106,12 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ - 'SHORTSUFFIX=nwl'#010+ + 'SHORTSUFFIX=nwl'#010, 'IMPORTLIBPREFIX=imp'#010+ - 'endi','f'#010+ + 'endif'#010+ #010+ - '# MacOS'#010+ - 'ifeq ($(OS_TARGET),macos)'#010+ + '# Mac OS Classic'#010+ + 'ifeq ($(OS_TARGET),macosclassic)'#010+ 'BATCHEXT='#010+ 'EXEEXT='#010+ 'DEBUGSYMEXT=.xcoff'#010+ @@ -1121,12 +1120,12 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ '# Darwin'#010+ - 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+ + 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim ios),)'#010+ 'BATCHEXT=.sh'#010+ - 'EXEEXT='#010+ + 'EXEE','XT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=dwn'#010+ - 'EXEDBGEXT','=.dSYM'#010+ + 'EXEDBGEXT=.dSYM'#010+ 'endif'#010+ #010+ '# gba'#010+ @@ -1143,8 +1142,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ '# NativeNT'#010+ - 'ifeq ($(OS_TARGET),NativeNT)'#010+ - 'SHAREDLIBEXT=.dll'#010, + 'ife','q ($(OS_TARGET),NativeNT)'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=nativent'#010+ 'endif'#010+ #010+ @@ -1161,11 +1160,11 @@ const fpcmakeini : array[0..243,1..240] of char=( 'EXEEXT='#010+ 'SHAREDLIBEXT=.a'#010+ 'SHORTSUFFIX=aix'#010+ - 'endif'#010+ + 'end','if'#010+ #010+ '# Java'#010+ 'ifeq ($(OS_TARGET),java)'#010+ - 'OEXT=.cl','ass'#010+ + 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ 'SHAREDLIBEXT=.jar'#010+ 'SHORTSUFFIX=java'#010+ @@ -1179,11 +1178,11 @@ const fpcmakeini : array[0..243,1..240] of char=( 'SHAREDLIBEXT=.jar'#010+ 'SHORTSUFFIX=android'#010+ 'endif'#010+ - 'endif'#010+ + 'endif'#010, #010+ '# MS-DOS'#010+ 'ifeq ($(OS_TARGET),msdos)'#010+ - 'STATICLI','BPREFIX='#010+ + 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHORTSUFFIX=d16'#010+ 'endif'#010+ @@ -1199,9 +1198,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'SHORTSUFFIX=emb'#010+ 'endif'#010+ #010+ - '# Win16'#010+ + '# ','Win16'#010+ 'ifeq ($(OS_TARGET),win16)'#010+ - 'STATICLIBPRE','FIX='#010+ + 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=w16'#010+ @@ -1210,9 +1209,9 @@ const fpcmakeini : array[0..243,1..240] of char=( #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+ + 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs))',',)'#010+ 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ - 'ZIPSUFFIX=','$(SHORTSUFFIX)'#010+ + 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ 'ZIPEXAMPLESUFFIX=exm'#010+ @@ -1221,9 +1220,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ZIPSOURCESUFFIX=.source'#010+ 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ - 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ + 'ZIPSUFFIX=.$(SOUR','CESUFFIX)'#010+ 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ - 'el','se'#010+ + 'else'#010+ 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'endif'#010+ @@ -1232,19 +1231,20 @@ const fpcmakeini : array[0..243,1..240] of char=( '[defaulttools]'#010+ '#####################################################################'#010+ '# Default Tools'#010+ - '#####################################################################'#010+ + '####################################','################################'+ + '#'#010+ #010+ - '# Names o','f the binutils tools'#010+ + '# Names of the binutils tools'#010+ 'ASNAME=$(BINUTILSPREFIX)as'#010+ 'LDNAME=$(BINUTILSPREFIX)ld'#010+ 'ARNAME=$(BINUTILSPREFIX)ar'#010+ 'RCNAME=$(BINUTILSPREFIX)rc'#010+ 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ - '# assembler, redefine it if cross compiling'#010+ + '# assembler, redefine it if cross c','ompiling'#010+ 'ifndef ASPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ASP','ROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ + 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ASPROG=$(ASNAME)'#010+ 'endif'#010+ @@ -1255,12 +1255,12 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'LDPROG=$(LDNAME)'#010+ + 'LDPROG=','$(LDNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Resource compiler'#010+ - 'i','fndef RCPROG'#010+ + 'ifndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ 'else'#010+ @@ -1271,13 +1271,13 @@ const fpcmakeini : array[0..243,1..240] of char=( '# Archiver'#010+ 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ + 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)',#010+ 'else'#010+ 'ARPROG=$(ARNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# NASM a','ssembler, redefine it if cross compiling'#010+ + '# NASM assembler, redefine it if cross compiling'#010+ 'ifndef NASMPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'NASMPROG=$(CROSSBINDIR)/$(NASMNAME)$(SRCEXEEXT)'#010+ @@ -1288,10 +1288,10 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Override defaults'#010+ 'AS=$(ASPROG)'#010+ - 'LD=$(LDPROG)'#010+ + 'L','D=$(LDPROG)'#010+ 'RC=$(RCPROG)'#010+ 'AR=$(ARPROG)'#010+ - 'NASM=$','(NASMPROG)'#010+ + 'NASM=$(NASMPROG)'#010+ #010+ '# ppas.bat / ppas.sh'#010+ 'ifdef inUnix'#010+ @@ -1307,9 +1307,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'LDCONFIG='#010+ 'endif'#010+ #010+ - 'ifdef DATE'#010+ + 'ifd','ef DATE'#010+ 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ - 'el','se'#010+ + 'else'#010+ 'DATESTR='#010+ 'endif'#010+ #010+ @@ -1328,15 +1328,15 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ #010+ '[command_begin]'#010+ - '#####################################################################', - #010+ + '#########################','###########################################'+ + '#'#010+ '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ - '# compiler this needs to be turned off'#010+ + '# compiler this needs to be turn','ed off'#010+ 'ifndef NOCPUDEF'#010+ - 'override FPCOPTDEF=$(','ARCH)'#010+ + 'override FPCOPTDEF=$(ARCH)'#010+ 'endif'#010+ #010+ #010+ @@ -1346,19 +1346,19 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ - 'override FPCOPT+=-P$(ARCH)'#010+ + 'override FP','COPT+=-P$(ARCH)'#010+ 'endif'#010+ #010+ - 'ifeq ($(OS_SOURCE),op','enbsd)'#010+ + 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ 'ifndef CROSSBOOTSTRAP'#010+ - 'ifneq ($(BINUTILSPREFIX),)'#010+ + 'ifneq ($(BINUTILSPREFIX','),)'#010+ 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ - 'en','dif'#010+ + 'endif'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ 'endif'#010+ @@ -1366,9 +1366,9 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# When BINUTILSPREFIX is given and we are not cross-compiling then use'+ #010+ - '# it while compiling the fpmake file. (For example to build i386-freeb'+ - 'sd'#010+ - '# with BINUTILSPREF','IX=i386-)'#010+ + '# it while compiling the fpmake file. (For examp','le to build i386-fre'+ + 'ebsd'#010+ + '# with BINUTILSPREFIX=i386-)'#010+ 'ifndef CROSSCOMPILE'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ @@ -1376,9 +1376,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# User dirs should be first, so they are looked at first'#010+ + '# User dirs should be first, so they',' are looked at first'#010+ 'ifdef UNITDIR'#010+ - 'override ','FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ @@ -1387,10 +1387,10 @@ const fpcmakeini : array[0..243,1..240] of char=( 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ + 'override FPCOPT','+=$(addprefix -Fi,$(INCDIR))'#010+ 'endif'#010+ #010+ - '# Smartl','inking'#010+ + '# Smartlinking'#010+ 'ifdef LINKSMART'#010+ 'override FPCOPT+=-XX'#010+ 'endif'#010+ @@ -1406,8 +1406,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'override FPCOPTDEF+=DEBUG'#010+ 'endif'#010+ #010+ - '# Release mode'#010+ - '# (strip, optimize and don'#039't l','oad fpc.cfg)'#010+ + '#',' Release mode'#010+ + '# (strip, optimize and don'#039't load fpc.cfg)'#010+ 'ifdef RELEASE'#010+ 'FPCCPUOPT:=-O2'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ @@ -1421,10 +1421,10 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Optimizer'#010+ 'ifdef OPTIMIZE'#010+ - 'override FPCOPT+=-O2'#010+ + 'ove','rride FPCOPT+=-O2'#010+ 'endif'#010+ #010+ - '# Verbose settings ','(warning,note,info)'#010+ + '# Verbose settings (warning,note,info)'#010+ 'ifdef VERBOSE'#010+ 'override FPCOPT+=-vwni'#010+ 'endif'#010+ @@ -1434,16 +1434,16 @@ const fpcmakeini : array[0..243,1..240] of char=( 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ + 'override FPCOPT+=','$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ - 'i','fdef COMPILER_LIBRARYDIR'#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+ 'endif'#010+ - 'ifdef COMPILER_INCLUDEDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(COMP','ILER_INCLUDEDIR))'#010+ + 'ifdef COMPILER_INCLUD','EDIR'#010+ + 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ 'endif'#010+ #010+ '# Cross compiler utils'#010+ @@ -1453,8 +1453,8 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ - 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ - 'ifeq ($(COM','PILER_TARGETDIR),.)'#010+ + 'override ','FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ + 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ @@ -1463,16 +1463,16 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ - 'ifeq ','($(COMPILER_UNITTARGETDIR),.)'#010+ + 'overrid','e FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ + 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ - 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ - 'override UNITTARGETDIRPREFIX=','$(TARGETDIRPREFIX)'#010+ + 'override COMPILER_UNITTARGETDIR=$(COMPI','LER_TARGETDIR)'#010+ + 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1482,8 +1482,8 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# create always pic'#039'ed code on x86_64, mips and mipsel'#010+ '# on unix-like systems'#010+ - 'ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linu'+ - 'x solaris),)'#010, + 'ifneq ($(findstring $(OS_TARGET),dragon','fly freebsd openbsd netbsd li'+ + 'nux solaris),)'#010+ 'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ @@ -1495,9 +1495,9 @@ const fpcmakeini : array[0..243,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+ + 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ @@ -1507,19 +1507,19 @@ const fpcmakeini : array[0..243,1..240] of char=( '[command_end]'#010+ '# Add commandline options last so they can override'#010+ 'ifdef OPT'#010+ - 'override FPCOPT+=$(OPT)'#010+ + 'override FPCOPT+=$(OPT)'#010, 'endif'#010+ #010+ - '# Override options to compile the fpm','ake-binary with command-line op'+ - 'tions provided in FPMAKEBUILDOPT'#010+ + '# Override options to compile the fpmake-binary with command-line opti'+ + 'ons 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+ - 'en','dif'#010+ + 'over','ride FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ + 'endif'#010+ #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ @@ -1529,11 +1529,11 @@ const fpcmakeini : array[0..243,1..240] of char=( '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ - 'override FPCOPT:=!FPCEXTCMD'#010+ + 'override FPCOPT',':=!FPCEXTCMD'#010+ 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ - 'overrid','e AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ + 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ @@ -1541,19 +1541,19 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ 'ifdef ACROSSCOMPILE'#010+ - 'override FPCOPT+=$(CROSSOPT)'#010+ + 'override FPC','OPT+=$(CROSSOPT)'#010+ 'endif'#010+ #010+ - '# Compiler commandli','ne'#010+ + '# Compiler commandline'#010+ 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ #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+ + 'ifneq (,$(findstring -sh ,$(','COMPILER)))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ - 'ifneq (,$(fi','ndstring -s ,$(COMPILER)))'#010+ + 'ifneq (,$(findstring -s ,$(COMPILER)))'#010+ 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ @@ -1564,22 +1564,21 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifdef RUNBATCH'#010+ 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+ 'else'#010+ - 'EXECPPAS:=@$(PPAS)'#010+ + 'EXECPPAS:=@$(PP','AS)'#010+ 'endif'#010+ 'endif'#010+ #010+ #010+ '[loaderrules]'#010+ - '############','########################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Loaders'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ 'ifneq ($(TARGET_LOADERS),)'#010+ - 'override ALLTARGET+=fpc_loaders'#010+ - 'override CLEANTARGET+','=fpc_loaders_clean'#010+ + 'override ','ALLTARGET+=fpc_loaders'#010+ + 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ @@ -1587,7 +1586,7 @@ const fpcmakeini : array[0..243,1..240] of char=( #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+ @@ -1596,19 +1595,19 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ - ')'#010+ + ' -$(DEL) $(addprefix $(COMPILER_UNITTARGE','TDIR)/,$(LOADEROFILE'+ + 'S))'#010+ 'else'#010+ - ' -$(DEL)',' $(LOADEROFILES)'#010+ + ' -$(DEL) $(LOADEROFILES)'#010+ 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ - 'ES)) $(INSTALL_UNITDIR)'#010+ + 'ES)) $(INSTALL_U','NITDIR)'#010+ 'else'#010+ - ' $(INSTALL) $(LOADEROFIL','ES) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ #010+ #010+ @@ -1617,15 +1616,15 @@ const fpcmakeini : array[0..243,1..240] of char=( '# Units'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_units'#010+ + '.PHO','NY: fpc_units'#010+ #010+ - 'ifneq ($(TARGET_UNITS)$(TARGE','T_IMPLICITUNITS),)'#010+ + 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ - 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICIT','UNITPPUFILES)'#010+ + 'override',' INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ @@ -1633,29 +1632,29 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ #010+ '[exerules]'#010+ - '#####################################################################'#010+ - '# Exes'#010+ - '############','########################################################'+ + '#############################################','#######################'+ '#'#010+ + '# Exes'#010+ + '#####################################################################'#010+ #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+ - 'over','ride EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+ - 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ - ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ + 'override EXEFILES=$(','addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ + 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) '+ + '$(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$','(TARGET_'+ 'PROGRAMS)))'#010+ - 'override EXEDBGFILES:=$(','addsuffix $(EXEDBGEXT),$(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 CLEANEXEDBGFILES+=$(EXEDBGF','ILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEAN','EXEFILES+=$(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+ @@ -1663,8 +1662,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+ - #010, + 'fpc_exes: $(COMPILER_TARGET','DIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES'+ + ')'#010+ + #010+ #010+ '[rstrules]'#010+ '#####################################################################'#010+ @@ -1672,7 +1672,7 @@ const fpcmakeini : array[0..243,1..240] of char=( '#####################################################################'#010+ #010+ 'ifdef TARGET_RSTS'#010+ - 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_R','STS))'#010+ + 'overri','de RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ @@ -1681,45 +1681,46 @@ const fpcmakeini : array[0..243,1..240] of char=( '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '#####################################################################'#010+ + '#################################################','###################'+ + '#'#010+ #010+ '.PHONY: fpc_examples'#010+ - #010, + #010+ 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_E'+ - 'XAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ - 'override E','XAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ + 'XAMPLES)) $(ad','dsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+ - '))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffi','x $(STATICLIBEXT),$(TAR'+ + ')',')) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ 'GET_EXAMPLES)))'#010+ 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+ #010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ - 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ + 'override CLEANEXEDBGFILES+=$','(EXAMPLEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'ov','erride CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'endif'#010+ - 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ + 'ifneq ($(TARGET_EXAMPL','EDIRS),)'#010+ 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: ','all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ - 'IRS))'#010+ + 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ + 'S))'#010+ #010+ #010+ '[compilerules]'#010+ '#####################################################################'#010+ '# General compile rules'#010+ - '#####################################################################', - #010+ + '#########################','###########################################'+ + '#'#010+ #010+ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ #010+ @@ -1729,9 +1730,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'fpc_all: $(FPCMADE)'#010+ #010+ 'fpc_smart:'#010+ - ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ + ' $(MAK','E) all LINKSMART=1 CREATESMART=1'#010+ #010+ - 'fpc_debug:',#010+ + 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ @@ -1740,9 +1741,9 @@ const fpcmakeini : array[0..243,1..240] of char=( '# General compile rules, available for both possible .pp and .pas exte'+ 'nsions'#010+ #010+ - '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ + '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas ','.lpr .dpr .pp .rc .res'#010+ #010+ - '$(COMPILER_UNITTARGE','TDIR):'#010+ + '$(COMPILER_UNITTARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ @@ -1752,9 +1753,9 @@ const fpcmakeini : array[0..243,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(PPUEXT): %.pas'#010+ + '%$(PPUEXT): %','.pas'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPP','AS)'#010+ + ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ @@ -1768,34 +1769,33 @@ const fpcmakeini : array[0..243,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(EXEEXT): %.dpr'#010+ + '%$(EXE','EXT): %.dpr'#010+ ' $(COMPILER) $<'#010+ - ' $','(EXECPPAS)'#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 %.lpr $(COMPILER_SOUR','CEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMP','ILER_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 %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ + 'vpath %$(PPUEXT) $(COMPILER_UNITT','ARGETDIR)'#010+ #010+ '[sharedrules]'#010+ - '###################','#################################################'+ - '#'#010+ + '#####################################################################'#010+ '# Library'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_shared'#010+ #010+ 'override INSTALLTARGET+=fpc_shared_install'#010+ - #010+ + #010, 'ifndef SHARED_LIBVERSION'#010+ - 'SHARED_LIBVERSION=$','(FPC_VERSION)'#010+ + 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ 'endif'#010+ #010+ 'ifndef SHARED_LIBNAME'#010+ @@ -1805,9 +1805,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifndef SHARED_FULLNAME'#010+ 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ 'N)$(SHAREDLIBEXT)'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ - '# Default sharedlib units are all unit ob','jects'#010+ + '# Default sharedlib units are all unit objects'#010+ 'ifndef SHARED_LIBUNITS'#010+ 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ @@ -1815,69 +1815,69 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ 'fpc_shared:'#010+ - 'ifdef HASSHAREDLIB'#010+ - ' $(MAKE) all CREATESHARED=1 L','INKSHARED=1 CREATESMART=1'#010+ + 'ifdef HASSH','AREDLIB'#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)'#010+ 'endif'#010+ 'else'#010+ - ' @$(ECHO) Shared Libraries not supported'#010+ + ' @$(ECHO',') Shared Libraries not supported'#010+ 'endif'#010+ #010+ - 'fpc_','shared_install:'#010+ + 'fpc_shared_install:'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ - ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ - 'ALL_SHAREDDIR)'#010+ + ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNA','ME) $(IN'+ + 'STALL_SHAREDDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ - #010, + #010+ '[installrules]'#010+ '#####################################################################'#010+ '# Install rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ + '.PHONY: fpc_install fpc_','sourceinstall fpc_exampleinstall'#010+ #010+ - 'ifdef INST','ALL_UNITS'#010+ + 'ifdef INSTALL_UNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ - '(INSTALLPPUFILES))'#010+ + '(INSTALLPPUFILES))'#010, 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ - '# Avoid getting',' the same name twice as some install EXE fail'#010+ + '# Avoid getting the same name twice as some install EXE fail'#010+ '# in this case, happends for instance for OS/2 target'#010+ 'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+ 'IBEXT))'#010+ - 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INST','ALLPPU'+ + 'override INSTALLPP','ULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ 'FILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ 'else'#010+ - 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$','(OEXT),$(INSTALLPPU'+ + 'overr','ide INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ 'FILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES)))'#010+ 'endif'#010+ #010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ - '$(INSTALLPPUFILES)','))'#010+ + 'override INSTALLPPUFILES:=$(addprefix $(UNIT','TARGETDIRPREFIX),$(notdi'+ + 'r $(INSTALLPPUFILES)))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ 'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ - #010+ + #010, 'ifdef INSTALLEXEFILES'#010+ - 'ifneq ($(TARGETDIRPREF','IX),)'#010+ + 'ifneq ($(TARGETDIRPREFIX),)'#010+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ 'STALLEXEFILES)))'#010+ 'endif'#010+ @@ -1885,16 +1885,16 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' $(MKDIR) $(INSTALL_BINDIR)'#010+ - ' $(INSTALLEXE) $(INSTALLEXEFILES) $(','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+ - 'ifdef PACKAGE_VERSION'#010+ - 'ifneq ($(wildcard Makefi','le.fpc),)'#010+ + 'if','def PACKAGE_VERSION'#010+ + 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ @@ -1902,15 +1902,15 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALLPPUFILES'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR',')'#010+ + 'ifdef INSTAL','LPPUFILES'#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ - ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ - ' $(','INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ + ' ',' $(MKDIR) $(INSTALL_LIBDIR)'#010+ + ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ @@ -1918,24 +1918,24 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FILES'#010+ ' $(MKDIR) $(INSTALL_DATADIR)'#010+ - ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DAT','ADIR)'#010+ + ' ',' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+ - 'ARGET_EXAMPLEDIRS))'#010+ - 'ifdef HASEXAMPL','ES'#010+ + 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _dist','clean,$'+ + '(TARGET_EXAMPLEDIRS))'#010+ + 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ - 'AMPLED','IR)'#010+ + ' $(COPYTREE) $(addsuffix ','/*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+ + 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ @@ -1943,9 +1943,9 @@ const fpcmakeini : array[0..243,1..240] of char=( '# Dist Install'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_distinstall'#010+ + '.PHONY: fp','c_distinstall'#010+ #010+ - 'fpc_distinstall: install exam','pleinstall'#010+ + 'fpc_distinstall: install exampleinstall'#010+ #010+ #010+ '[zipinstallrules]'#010+ @@ -1953,7 +1953,7 @@ const fpcmakeini : array[0..243,1..240] of char=( '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinst','all'#010+ + '.PHONY: fpc_zipins','tall 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+ @@ -1961,11 +1961,11 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ - 'PACKDIR=/tmp/fpc-pack'#010+ + 'P','ACKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Maybe cr','eate default zipname from packagename'#010+ + '# Maybe create default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ @@ -1975,10 +1975,10 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ 'ifndef FULLZIPNAME'#010+ - 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ + 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFI','X)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ - '# ZipTarget'#010, + '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ 'ifdef DIST_ZIPTARGET'#010+ 'ZIPTARGET=DIST_ZIPTARGET'#010+ @@ -1994,26 +1994,27 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Use a wrapper script by default for Os/2'#010+ + '# Use a wrapper',' script by default for Os/2'#010+ 'ifndef inUnix'#010+ - 'US','EZIPWRAPPER=1'#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+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRC','BATCHEXT)'+ + ')'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ - '# Create',' commands to create the zip/tar file'#010+ + '# Create commands to create the zip/tar file'#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ - 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ - 'ZIPCMD_ZIP:=$(TARPROG) c$(TAR','OPT)f $(ZIPDESTFILE) *'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIP','NAME)$(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'+ @@ -2021,21 +2022,21 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ - ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZI','PINSTALL=1'#010+ + ' $(MAK','E) $(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))" > $(ZIPW','RAP'+ + ' $(ECHOREDIR) ','-e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+ 'PER)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ - ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_ZIP) >> $(ZIPW','RAPPER)'#010+ + ' echo $(ZIPCMD_CDPACK) > $(ZIPW','RAPPER)'#010+ + ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ @@ -2046,10 +2047,10 @@ const fpcmakeini : array[0..243,1..240] of char=( 'else'#010+ ' $(ZIPWRAPPER)'#010+ 'endif'#010+ - 'endif'#010+ + 'endif',#010+ ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $','(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ + ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ @@ -2057,10 +2058,10 @@ const fpcmakeini : array[0..243,1..240] of char=( ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ 'SOURCESUFFIX)'#010+ #010+ - 'fpc_zipexampleinstall:'#010+ + 'f','pc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ - ' ',' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$('+ - 'ZIPEXAMPLESUFFIX)'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+ + 'PEXAMPLESUFFIX)'#010+ 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ @@ -2068,7 +2069,7 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ #010+ '[cleanrules]'#010+ - '###############################################################','#####'+ + '###################','#################################################'+ '#'#010+ '# Clean rules'#010+ '#####################################################################'#010+ @@ -2076,16 +2077,16 @@ const fpcmakeini : array[0..243,1..240] of char=( '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ - '))'#010+ - 'override CLEAN','EXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXE'+ - 'DBGFILES))'#010+ + 'override CLEANEXEFILES:=$(addprefix $(TARGE','TDIRPREFIX),$(CLEANEXEFIL'+ + 'ES))'#010+ + 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ + 'GFILES))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_PROGRAMS'#010+ 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+ 'XEEXT), $(CLEAN_PROGRAMS)))'#010+ - 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDI','RPREFIX),$(addsuffi'+ + 'overr','ide CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffi'+ 'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ @@ -2094,30 +2095,30 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ')',' $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ + 'override CLEANPPULINKFILES:','=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ - 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUG','SYMEXT),$(CLEAN'+ + 'override ','CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+ 'PPUFILES))'#010+ 'endif'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ - 'IX),$(CLEANPPULINKFILES)))'#010+ + 'IX),$(CLEANPPULIN','KFILES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ - 'i','fdef CLEANEXEFILES'#010+ + 'ifdef 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+ 'endif'#010+ - 'ifdef CLEANPPUFILES'#010+ - ' -$(DEL) $(CLEANPPU','FILES)'#010+ + 'if','def CLEANPPUFILES'#010+ + ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ @@ -2125,18 +2126,18 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ - 'ifdef CLEAN_FILES'#010+ + 'ifdef CLEAN_FIL','ES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ - 'ifde','f LIB_NAME'#010+ + 'ifdef LIB_NAME'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#010+ - ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$'+ - '(BATCHEXT)'#010+ + ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHE','XT) ppas$(BATCHEXT) ppaslin'+ + 'k$(BATCHEXT)'#010+ #010+ - 'fpc','_cleanall: $(CLEANTARGET)'#010+ + 'fpc_cleanall: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ @@ -2144,8 +2145,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$(DEL) $(CLEANPPULINKFILES)'#010, + 'ifneq ($(CLEANPPULINKFI','LES),)'#010+ + ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -2155,15 +2156,15 @@ const fpcmakeini : array[0..243,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ - ' -$(DELTREE) bin'#010+ - ' -$(DEL) *$(OEXT) *$(','PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ - 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' ','-$(DELTREE) bin'#010+ + ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ + 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+ - 'CEX','TFILE) $(REDIRFILE)'#010+ + ' -$(DEL) fpcmade.* Pac','kage.fpc $(PPAS) script.res link.res $('+ + 'FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ @@ -2171,8 +2172,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'ifdef DEBUGSYMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ - 'ifdef LOCALFPMAKEBIN'#010+ - ' -$(DEL) $(LOCALFP','MAKEBIN)'#010+ + 'if','def LOCALFPMAKEBIN'#010+ + ' -$(DEL) $(LOCALFPMAKEBIN)'#010+ ' -$(DEL) $(FPMAKEBINOBJ)'#010+ 'endif'#010+ #010+ @@ -2182,7 +2183,7 @@ const fpcmakeini : array[0..243,1..240] of char=( '[baseinforules]'#010+ '#####################################################################'#010+ '# Base info rules'#010+ - '##############################################################','######'+ + '##################','##################################################'+ '#'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ @@ -2193,94 +2194,94 @@ const fpcmakeini : array[0..243,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ - ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#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) Source CPU... $(CPU_SOURCE)'#010+ - ' @$(ECHO) Target CPU...',' $(CPU_TARGET)'#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) SourceSuffix. $(SOURCES','UFFIX)'#010+ + ' @$(ECHO) Full Target.. $(FULL_TARGE','T)'#010+ + ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ - ' @$(E','CHO)'#010+ + ' @$(ECHO) Requi','red pkgs... $(REQUIRE_PACKAGES)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ - ' @$(ECHO) PackagesDir..... $(PACKAGESDI','R)'#010+ + ' ',' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) As........ $(AS)'#010+ - ' @$(ECHO) ','Ld........ $(LD)'#010+ + ' @','$(ECHO) As........ $(AS)'#010+ + ' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ - ' @$(ECHO) Rm........ $(RMPROG)'#010+ - ' @$(ECHO) G','Install.. $(GINSTALL)'#010+ + ' @$(ECH','O) Rm........ $(RMPROG)'#010+ + ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ - ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ - ' @$(ECHO) Zip.....','.. $(ZIPPROG)'#010+ + ' @$(ECHO) PPUM','ove... $(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 Implicit Units.',' $(TARGET_IMPLICITUNITS)'#010+ + ' @$(ECHO) Target Units.......... $(TARGET_UNI','TS)'#010+ + ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ - ' @$(ECHO) Target ExampleDirs...','. $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO) Target Examples....... $(TARGET_EXAMP','LES)'#010+ + ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ - ' @$(ECHO) ','Install Files....... $(INSTALL_FILES)'#010+ + ' @$(ECHO) Install Unit','s....... $(INSTALL_UNITS)'#010+ + ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ - ' @$(ECHO) ZipPrefix..','.......... $(ZIPPREFIX)'#010+ + ' @$(ECHO) ZipName...........','... $(ZIPNAME)'#010+ + ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ - ' @$(ECHO) Install FPC Package.. $(INSTALL_','FPCPACKAGE)'#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 units dir.','... $(INSTALL_UNITDIR)'#010+ + ' @$(ECHO) Install library dir.. $(INSTALL_','LIBDIR)'#010+ + ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ - ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ - ' @$(ECHO) Install data dir..','... $(INSTALL_DATADIR)'#010+ + ' @$(ECHO) Install example dir.. $(INSTALL_EXAM','PLEDIR)'#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+ #010+ '[inforules]'#010+ - '##########################################################','##########'+ + '##############','######################################################'+ '#'#010+ '# Info rules'#010+ '#####################################################################'#010+ @@ -2290,8 +2291,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ - '#####################################################################'#010+ - '# Rebuild Makefi','le'#010+ + '##########################################','##########################'+ + '#'#010+ + '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ @@ -2299,28 +2301,27 @@ const fpcmakeini : array[0..243,1..240] of char=( ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ + ' ','$(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ - 'f','pc_makefile_sub1:'#010+ + 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ - 'T_EXAMPLEDIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /','Makefile.fpc,$(TAR'+ + 'GET_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'f','pc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+ - 'T_EXAMPLEDIRS))'#010+ + 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ + 'EXAMPLEDIRS))'#010+ #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ - '[localmakefile]'#010+ - '#####################################','###############################'+ - '#'#010+ + '[localmak','efile]'#010+ + '#####################################################################'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ #010+ @@ -2330,16 +2331,15 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ #010+ '[userrules]'#010+ - '##############################################','######################'+ + '##','##################################################################'+ '#'#010+ '# Users rules'#010+ '#####################################################################'#010+ #010+ '[lclrules]'#010+ '#####################################################################'#010+ - '# LCL Rules'#010+ - '######################################','##############################'+ - '#'#010+ + '# LCL ','Rules'#010+ + '#####################################################################'#010+ #010+ '# LCL Platform'#010+ 'ifndef LCL_PLATFORM'#010+ @@ -2351,8 +2351,8 @@ const fpcmakeini : array[0..243,1..240] of char=( 'endif'#010+ 'export LCL_PLATFORM'#010+ #010+ - '# Check if the specified LCLDIR is correct'#010+ - 'ifdef L','CLDIR'#010+ + '# Chec','k if the specified LCLDIR is correct'#010+ + 'ifdef LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ @@ -2361,9 +2361,9 @@ const fpcmakeini : array[0..243,1..240] of char=( 'override LCLDIR=wrong'#010+ 'endif'#010+ #010+ - '# Check if the default LCLDIR is correct'#010+ + '# Check if the default LCLDIR is cor','rect'#010+ 'ifdef DEFAULT_LCLDIR'#010+ - 'override LCLDIR:=$','(subst \,/,$(DEFAULT_LCLDIR))'#010+ + 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2371,8 +2371,8 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Check for development version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca','r'+ - 'd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'override LCLDIR=$(subst ','/units/$(LCL_PLATFORM),,$(firstword $(wildca'+ + 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2380,100 +2380,101 @@ const fpcmakeini : array[0..243,1..240] of char=( #010+ '# Check for release version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca','r'+ - 'd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'override LCLDIR=$(subst ','/units/$(LCL_PLATFORM),,$(firstword $(wildca'+ + 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ - 'IR)/units)'#010+ - 'override LCLCOMPONEN','TDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo'+ - 'nents $(LCLDIR)/components)'#010+ + 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLA','TFORM) $(LC'+ + 'LDIR)/units)'#010+ + 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ + 'nts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ - 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ + 'overr','ide COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ - '[lclinf','orules]'#010+ + '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ 'override INFORULES+=lclinfo'#010+ #010+ - '.PHONY: lclinfo'#010+ + '.P','HONY: lclinfo'#010+ #010+ 'lclinfo:'#010+ - ' @$(ECHO) ==',' LCL info =='#010+ + ' @$(ECHO) == LCL info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ - ' @$(ECHO) LCL Component dir.... $(LCLCOMPO','NENTDIR)'#010+ + ' ',' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010+ #010+ '[fpmakeprerules]'#010+ '#####################################################################'#010+ '# fpmake prerules'#010+ - '#####################################################################'#010+ + '################################################################','####'+ + '#'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ - 'FPMAKEBIN','OBJ=fpmake$(OEXT)'#010+ + 'FPMAKEBINOBJ=fpmake$(OEXT)'#010+ 'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+ #010+ '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+ 'd --cpu parameters'#010+ 'ifdef OS_TARGET'#010+ 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ - 'endif'#010+ + 'endi','f'#010+ 'ifdef CPU_TARGET'#010+ - 'FPC_TARGETOPT+=--cpu=$(CP','U_TARGET)'#010+ + 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ '# Get the location of the bootstrap-fpmkunit units'#010+ 'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+ - 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ + 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR)))))',')'#010+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ - 'UNITDIR_FP','MAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+ - 'IX)'#010+ + 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ + ')'#010+ 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ - 'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ + 'FPMKUNIT_PPU=$(UNITDIR','_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+ 'endif'#010+ #010+ - 'ifdef ','FPMAKE_SKIP_CONFIG'#010+ + 'ifdef FPMAKE_SKIP_CONFIG'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+ 'endif'#010+ #010+ '[fpmakerules]'#010+ '#####################################################################'#010+ '# fpmake rules'#010+ - '##################################################################','##'+ + '######################','##############################################'+ '#'#010+ '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+ 'pleinstall'#010+ #010+ '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+ 'ake uses it'#039's own.'#010+ - 'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+ - 'override FPCOPT:=$(filt','er-out -FE%,$(FPCOPT))'#010+ + 'override FPCOPT:=$(filter','-out -FU%,$(FPCOPT))'#010+ + 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+ '# Compose general fpmake-parameters'#010+ 'ifdef FPMAKEOPT'#010+ 'FPMAKE_OPT+=$(FPMAKEOPT)'#010+ 'endif'#010+ 'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+ 'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+ - 'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+ - 'FPMAKE_OPT+=$(addpref','ix -o ,$(FPCOPT))'#010+ + 'FPMAKE','_OPT+=$(FPC_TARGETOPT)'#010+ + 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+ 'FPMAKE_OPT+=--compiler=$(FPC)'#010+ 'FPMAKE_OPT+=-bu'#010+ #010+ 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ 'ifdef UNIXHier'#010+ 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+ - 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fp','c/$(FPC_VER'+ + 'FPMAKE_INSTAL','L_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VER'+ 'SION)'#010+ 'else'#010+ 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+ @@ -2481,22 +2482,22 @@ const fpcmakeini : array[0..243,1..240] of char=( #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+ + 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exa','mpleinstall'#010+ + '# If no fpmake exists and (dist)clean is called, do not try to build f'+ + 'pmake, 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+ - 'override CLEANTARGET+=fpc_fpmake_clean'#010+ + 'override',' CLEANTARGET+=fpc_fpmake_clean'#010+ 'endif'#010+ #010+ - '$(FPMK','UNIT_PPU): $(FPMKUNIT_SRC)'#010+ + '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ ' $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+ 'T=,$(FPMAKE_BUILD_OPT))'#010+ #010+ '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+ - ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+ - 'IR)) $(F','PMAKE_BUILD_OPT)'#010+ + ' $(FPCFPMAKE) fpmake.pp $(a','ddprefix -Fu,$(COMPILER_FPMAKE_UNI'+ + 'TDIR)) $(FPMAKE_BUILD_OPT)'#010+ #010+ 'fpc_fpmake: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ @@ -2504,15 +2505,15 @@ const fpcmakeini : array[0..243,1..240] of char=( 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ #010+ - 'fpc_fpmake_install: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN)',' install $(FPMAKE_OPT) $(FPMAKE_INSTALL'+ - '_OPT)'#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+ - '# fpmake -ie installs everything, including the examples. This also me'+ - 'ans that on'#010+ - '# a distinstall fpmake in','stall wil be called twice.'#010+ + '# fpmake -ie installs everything, including the examples. This ','also '+ + 'means that on'#010+ + '# a distinstall fpmake install wil be called twice.'#010+ 'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ 'LL_OPT)'#010