diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 9b3b2669b1..2adccca210 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -521,27 +521,26 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# Packages dir'#010+ - 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/package'+ - 's/base $(FPCDIR)/packages/extra)'#010+ + 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)'#010+ #010+ #010+ '[shelltools]'#010+ - '#####################################','###############################'+ - '#'#010+ - '# Shell tools'#010+ '#####################################################################'#010+ + '# Shell tools'#010+ + '##','##################################################################'+ + '#'#010+ #010+ '# Echo that can redir (must be able run in the default OS shell)'#010+ 'ifndef ECHOREDIR'#010+ 'ifndef inUnix'#010+ 'ECHOREDIR=echo'#010+ 'else'#010+ - 'ECHORE','DIR=$(ECHO)'#010+ + 'ECHOREDIR=$(ECHO)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# To copy pograms'#010+ - 'ifndef COPY'#010+ + 'ifndef',' COPY'#010+ 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ #010+ @@ -556,11 +555,11 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# To move pograms'#010+ - 'i','fndef MOVE'#010+ + 'ifndef MOVE'#010+ 'MOVE:=$(MVPROG) -f'#010+ 'endif'#010+ #010+ - '# Check delete program'#010+ + '# Check dele','te program'#010+ 'ifndef DEL'#010+ 'DEL:=$(RMPROG) -f'#010+ 'endif'#010+ @@ -573,13 +572,13 @@ const fpcmakeini : array[0..242,1..240] of char=( '# To install files'#010+ 'ifndef INSTALL'#010+ 'ifdef inUnix'#010+ - 'INSTALL:=$(GINSTALL) -c -m 6','44'#010+ + 'INSTALL:=$(GINSTALL) -c -m 644'#010+ 'else'#010+ 'INSTALL:=$(COPY)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# To install programs'#010+ + '# To instal','l programs'#010+ 'ifndef INSTALLEXE'#010+ 'ifdef inUnix'#010+ 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ @@ -593,19 +592,18 @@ const fpcmakeini : array[0..242,1..240] of char=( 'MKDIR:=$(GINSTALL) -m 755 -d'#010+ 'endif'#010+ #010+ - 'expor','t ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE M'+ + 'export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTAL','L INSTALLEXE M'+ 'KDIR'#010+ #010+ #010+ '[defaultdirs]'#010+ '#####################################################################'#010+ '# Default Directories'#010+ - '################################################################','####'+ - '#'#010+ + '#####################################################################'#010+ #010+ '# Units dir'#010+ 'ifdef REQUIRE_UNITSDIR'#010+ - 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ + 'overrid','e UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ 'endif'#010+ #010+ '# Units dir'#010+ @@ -615,7 +613,7 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ #010+ '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+ - '# When zipping',' use the target os default, when normal install then'#010+ + '# When zipping use the target os default, when normal install t','hen'#010+ '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ @@ -624,12 +622,12 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ 'else'#010+ '# Normal install'#010+ - 'ifneq ($(findstring $(OS_SOURCE),$(UNIXs))',',)'#010+ + 'ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# When install prefix is not set try to use prefix'#010+ + '# When install prefix ','is not set try to use prefix'#010+ 'ifndef INSTALL_PREFIX'#010+ 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ @@ -638,10 +636,10 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# set the prefix directory where to install everything'#010+ 'ifndef INSTALL_PREFIX'#010+ - 'ifdef UNIXHi','er'#010+ + 'ifdef UNIXHier'#010+ 'INSTALL_PREFIX=/usr/local'#010+ 'else'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ + 'ifdef INSTALL_F','PCPACKAGE'#010+ 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ 'INSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ @@ -651,9 +649,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'export INSTALL_PREFIX'#010+ #010+ '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+ - '# used recursively for all ','subdirs'#010+ + '# used recursively for all subdirs'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'export INSTALL_FPCSUBDIR'#010+ + 'export INSTALL_FP','CSUBDIR'#010+ 'endif'#010+ #010+ '# Where to place the resulting zip files'#010+ @@ -664,8 +662,8 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# EXE/PPU Target directories'#010+ 'ifndef COMPILER_UNITTARGETDIR'#010+ - 'ifde','f PACKAGEDIR_MAIN'#010+ - 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ + 'ifdef PACKAGEDIR_MAIN'#010+ + 'COMPILER_UNITTARGETDIR=$(PACKAG','EDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ 'else'#010+ 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ 'endif'#010+ @@ -675,16 +673,15 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ #010+ - '#########################################','###########################'+ - '#'#010+ - '# Install Directories'#010+ + '#####################################################################'#010+ + '# Install Directorie','s'#010+ '#####################################################################'#010+ #010+ '# set the base directory where to install everything'#010+ 'ifndef INSTALL_BASEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'IN','STALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VE','RSION)'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ @@ -694,18 +691,18 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# set the directory where to install the binaries'#010+ - 'ifndef INSTALL_','BINDIR'#010+ + 'ifndef INSTALL_BINDIR'#010+ 'ifdef UNIXHier'#010+ - 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ + 'INSTALL_BINDIR:=$(INSTALL_P','REFIX)/bin'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ '# for FPC packages install the binaries under their target subdir'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef CROSSCOMPILE'#010+ 'ifdef CROSSINSTALL'#010+ - 'INSTALL','_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+ 'else'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ + 'I','NSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ @@ -715,8 +712,8 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# set the directory where to install the units.'#010+ - 'ifndef I','NSTALL_UNITDIR'#010+ - 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ + 'ifndef INSTALL_UNITDIR'#010+ + 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR',')/units/$(TARGETSUFFIX)'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef PACKAGE_NAME'#010+ 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ @@ -725,9 +722,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# Where to install shared libraries'#010+ - 'ifndef INSTALL_L','IBDIR'#010+ + 'ifndef INSTALL_LIBDIR'#010+ 'ifdef UNIXHier'#010+ - 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+ + 'INSTALL_LIBDIR:=$(INSTALL_PR','EFIX)/lib'#010+ 'else'#010+ 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ 'endif'#010+ @@ -739,10 +736,10 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifdef BSDhier'#010+ 'SRCPREFIXDIR=share/src'#010+ 'else'#010+ - 'ifdef ','linuxHier'#010+ + 'ifdef linuxHier'#010+ 'SRCPREFIXDIR=share/src'#010+ 'else'#010+ - 'SRCPREFIXDIR=src'#010+ + 'SRCPREFIXDI','R=src'#010+ 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -750,7 +747,7 @@ const fpcmakeini : array[0..242,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_SO','URCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSI'+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(','FPC_VERSI'+ 'ON)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ @@ -760,7 +757,7 @@ const fpcmakeini : array[0..242,1..240] of char=( 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'INS','TALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$('+ + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTA','LL_FPCSUBDIR)/$('+ 'PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ @@ -771,9 +768,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the doc file','s will be stored'#010+ + '# Where the doc files will be stored'#010+ 'ifndef INSTALL_DOCDIR'#010+ - 'ifdef UNIXHier'#010+ + 'ifdef UNIX','Hier'#010+ 'ifdef BSDhier'#010+ 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ @@ -784,51 +781,51 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXD','IR)/fpc-$(FPC_VERSION)'+ - '/$(PACKAGE_NAME)'#010+ + 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ + '(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+ - 'CKAGE_VERSION)'#010+ + 'INSTA','LL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$('+ + 'PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_DOCDIR:','=$(INSTALL_BASEDIR)/doc'#010+ + 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Where to install the examples, under linux we use the doc dir'#010+ + '# Wher','e 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 B','SDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+ - ')/$(PACKAGE_NAME)'#010+ + 'ifdef BSDhier'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/shar','e/examples/fpc-$(FPC_VERSI'+ + 'ON)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+ - '$(','PACKAGE_NAME)'#010+ + '$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ 'else'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+ - '(PACKAGE_VERSION)'#010+ + 'IN','STALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)'+ + '-$(PACKAGE_VERSION)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+ 'GE_VERSION)'#010+ - 'el','se'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ - 'RSION)'#010+ + 'else'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PA','CKAGE_NAME)-$(PACKAGE_'+ + 'VERSION)'#010+ 'endif'#010+ #010+ 'endif'#010+ @@ -837,12 +834,12 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/exa','mples'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Where the some extra (data)files will be stored'#010+ + '# Where the some extra (','data)files will be stored'#010+ 'ifndef INSTALL_DATADIR'#010+ 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ @@ -851,23 +848,21 @@ const fpcmakeini : array[0..242,1..240] of char=( 'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+ 'endif'#010+ #010+ - '############################','########################################'+ - '#'#010+ - '# Cross compile dirs'#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 availab','le in FPCDIR. If no targets/ subdir'+ - #010+ - '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ + '# First check if they are available in FPCDIR. If no targets/ subdir'#010+ + '# is found us','e the targets/ subdir in INSTALL_BASEDIR.'#010+ 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ - 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/c','ross/$(TARGETSUFFIX)/bin'+ - '/$(FULL_SOURCE))'#010+ - 'endif'#010+ + 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ + '(FULL_SOURCE))'#010+ 'endif'#010+ + 'en','dif'#010+ 'else'#010+ 'CROSSBINDIR='#010+ 'endif'#010+ @@ -880,29 +875,29 @@ const fpcmakeini : array[0..242,1..240] of char=( '# Amd64 to i386?'#010+ 'ifndef GCCLIBDIR'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ - 'ifneq ($(findstring x','86_64,$(shell uname -a)),)'#010+ - 'ifeq ($(BINUTILSPREFIX),)'#010+ + 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+ + 'ifeq ($(BINUTILSPREFIX','),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ 'ifeq ($(CPU_TARGET),powerpc64)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgc','c-file-name`)'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Try cross gcc'#010+ + '# Try cross gcc'#010, 'ifndef GCCLIBDIR'#010+ 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+ 'XT),$(SEARCHPATH))))'#010+ 'ifneq ($(CROSSGCC),)'#010+ - 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-nam','e`)'#010+ + 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# Other libraries from ld.so.conf'#010+ + '# Other libraries from ld.so.con','f'#010+ 'ifndef OTHERLIBDIR'#010+ 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ '"; print $1 }'#039')'#010+ @@ -913,19 +908,20 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifeq ($(OS_SOURCE),netbsd)'#010+ 'OTHERLIBDIR+=/usr/pkg/lib'#010+ 'endif'#010+ - 'exp','ort GCCLIBDIR OTHERLIB'#010+ + 'export GCCLIBDIR OTHERLIB'#010+ 'endif'#010+ #010+ #010+ '[extensions]'#010+ - '#####################################################################'#010+ + '#####','###############################################################'+ + '#'#010+ '# Default extensions'#010+ '#####################################################################'#010+ #010+ - '# Default needed extensions (Go32v','2,Linux)'#010+ + '# Default needed extensions (Go32v2,Linux)'#010+ 'BATCHEXT=.bat'#010+ 'LOADEREXT=.as'#010+ - 'EXEEXT=.exe'#010+ + 'EXEEXT=.exe'#010, 'PPLEXT=.ppl'#010+ 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ @@ -937,10 +933,10 @@ const fpcmakeini : array[0..242,1..240] of char=( 'STATICLIBPREFIX=libp'#010+ 'IMPORTLIBPREFIX=libimp'#010+ 'RSTEXT=.rst'#010+ - '# external debug info for',' executable'#010+ + '# external debug info for executable'#010+ 'EXEDBGEXT=.dbg'#010+ - '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ - ' has this'#010+ + '#DEBUGSYMEXT #for debu','gger symbol files, define only for targets whi'+ + 'ch has this'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ @@ -951,12 +947,12 @@ const fpcmakeini : array[0..242,1..240] of char=( '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ 'STATICLIBPREFIX='#010+ - 'SHOR','TSUFFIX=dos'#010+ + 'SHORTSUFFIX=dos'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ #010+ '# watcom'#010+ - 'ifeq ($(OS_TARGET),watcom)'#010+ + 'ifeq',' ($(OS_TARGET),watcom)'#010+ 'STATICLIBPREFIX='#010+ 'OEXT=.obj'#010+ 'ASMEXT=.asm'#010+ @@ -967,11 +963,11 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# Android native'#010+ 'ifneq ($(CPU_TARGET),jvm)'#010+ - 'ifeq ($(OS_TARGET),android)'#010, + 'ifeq ($(OS_TARGET),android)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHORTSUFFIX=lnx'#010+ + 'SHORTSUFFIX=l','nx'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -987,12 +983,12 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifeq ($(OS_TARGET),dragonfly)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010, + 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=df'#010+ 'endif'#010+ #010+ '# FreeBSD'#010+ - 'ifeq ($(OS_TARGET),freebsd)'#010+ + 'ifeq ($(OS_TARGET','),freebsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1008,11 +1004,11 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# OpenBSD'#010+ - 'ifeq ($(OS_TARGE','T),openbsd)'#010+ + 'ifeq ($(OS_TARGET),openbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHORTSUFFIX=obs'#010+ + 'S','HORTSUFFIX=obs'#010+ 'endif'#010+ #010+ '# Win32'#010+ @@ -1027,11 +1023,11 @@ const fpcmakeini : array[0..242,1..240] of char=( 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ 'SHAREDLIBEXT=.dll'#010+ - 'S','HORTSUFFIX=os2'#010+ + 'SHORTSUFFIX=os2'#010+ 'ECHO=echo'#010+ 'IMPORTLIBPREFIX='#010+ 'endif'#010+ - #010+ + #010, '# EMX'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'BATCHEXT=.cmd'#010+ @@ -1046,12 +1042,12 @@ const fpcmakeini : array[0..242,1..240] of char=( '# Amiga'#010+ 'ifeq ($(OS_TARGET),amiga)'#010+ 'EXEEXT='#010+ - 'SHAREDL','IBEXT=.library'#010+ + 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=amg'#010+ 'endif'#010+ #010+ '# AROS'#010+ - 'ifeq ($(OS_TARGET),aros)'#010+ + 'ifeq',' ($(OS_TARGET),aros)'#010+ 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=aros'#010+ @@ -1065,12 +1061,12 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# Atari'#010+ - 'ifeq ($(OS_TARGET','),atari)'#010+ + 'ifeq ($(OS_TARGET),atari)'#010+ 'EXEEXT=.ttp'#010+ 'SHORTSUFFIX=ata'#010+ 'endif'#010+ #010+ - '# BeOS'#010+ + '# BeO','S'#010+ 'ifeq ($(OS_TARGET),beos)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ @@ -1086,13 +1082,13 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# Solaris'#010+ 'ifeq ($(OS_TARGET),solaris)'#010+ - 'BATCH','EXT=.sh'#010+ + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=sun'#010+ 'endif'#010+ #010+ '# QNX'#010+ - 'ifeq ($(OS_TARGET),qnx)'#010+ + 'ifeq',' ($(OS_TARGET),qnx)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=qnx'#010+ @@ -1106,10 +1102,10 @@ const fpcmakeini : array[0..242,1..240] of char=( 'IMPORTLIBPREFIX=imp'#010+ 'endif'#010+ #010+ - '# Netware lib','c'#010+ + '# Netware libc'#010+ 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'EXEEXT=.nlm'#010+ - 'STATICLIBPREFIX='#010+ + 'STATIC','LIBPREFIX='#010+ 'SHORTSUFFIX=nwl'#010+ 'IMPORTLIBPREFIX=imp'#010+ 'endif'#010+ @@ -1124,8 +1120,8 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# Darwin'#010+ - 'ifneq ($(finds','tring $(OS_TARGET),darwin iphonesim),)'#010+ - 'BATCHEXT=.sh'#010+ + 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+ + 'BATCHEXT=.','sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=dwn'#010+ @@ -1141,11 +1137,11 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# Symbian OS'#010+ 'ifeq ($(OS_TARGET),symbian)'#010+ - 'SHA','REDLIBEXT=.dll'#010+ + 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=symbian'#010+ 'endif'#010+ #010+ - '# NativeNT'#010+ + '# Nativ','eNT'#010+ 'ifeq ($(OS_TARGET),NativeNT)'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=nativent'#010+ @@ -1159,13 +1155,13 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# AIX'#010+ - 'ifeq ($(OS_TARGET),aix)'#010, + 'ifeq ($(OS_TARGET),aix)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=aix'#010+ 'endif'#010+ #010+ - '# Java'#010+ + '# Jav','a'#010+ 'ifeq ($(OS_TARGET),java)'#010+ 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ @@ -1178,12 +1174,12 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifeq ($(OS_TARGET),android)'#010+ 'OEXT=.class'#010+ 'ASMEXT=.j'#010+ - 'SHAREDLIBE','XT=.jar'#010+ + 'SHAREDLIBEXT=.jar'#010+ 'SHORTSUFFIX=android'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# MS-DOS'#010+ + '# MS-DOS',#010+ 'ifeq ($(OS_TARGET),msdos)'#010+ 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ @@ -1196,13 +1192,13 @@ const fpcmakeini : array[0..242,1..240] of char=( 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'else'#010+ - 'EXE','EXT=.bin'#010+ + 'EXEEXT=.bin'#010+ 'endif'#010+ 'SHORTSUFFIX=emb'#010+ 'endif'#010+ #010+ '# Win16'#010+ - 'ifeq ($(OS_TARGET),win16)'#010+ + 'ife','q ($(OS_TARGET),win16)'#010+ 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.dll'#010+ @@ -1212,8 +1208,8 @@ const fpcmakeini : array[0..242,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+ - 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ + 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ + 'FPCMAD','E=fpcmade.$(SHORTSUFFIX)'#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ @@ -1221,9 +1217,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'else'#010+ 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+ 'ZIPSOURCESUFFIX=.source'#010+ - 'ZIPEXAMPLESUFFIX=.examp','les'#010+ + 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ - 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ + 'ZIPSUFFIX=.$(SOURCESUFFIX)',#010+ 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ 'else'#010+ 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ @@ -1233,17 +1229,18 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '[defaulttools]'#010+ '#####################################################################'#010+ - '# Default To','ols'#010+ - '#####################################################################'#010+ + '# Default Tools'#010+ + '#############################################','#######################'+ + '#'#010+ #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)n','asm'#010+ + 'NASMNAME=$(BINUTILSPREFIX)nasm'#010+ #010+ - '# assembler, redefine it if cross compiling'#010+ + '# assembler, redefine it if cross compiling'#010, 'ifndef ASPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ @@ -1255,9 +1252,9 @@ const fpcmakeini : array[0..242,1..240] of char=( '# linker, but probably not used'#010+ 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'LDPROG=$(CROSSBI','NDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ + 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'LDPROG=$(LDNAME)'#010+ + 'LDPROG=$(LDNAME)',#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1273,9 +1270,9 @@ const fpcmakeini : array[0..242,1..240] of char=( '# Archiver'#010+ 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ARP','ROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ + 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ - 'ARPROG=$(ARNAME)'#010+ + 'ARP','ROG=$(ARNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1286,11 +1283,11 @@ const fpcmakeini : array[0..242,1..240] of char=( 'else'#010+ 'NASMPROG=$(NASMNAME)'#010+ 'endif'#010+ - 'e','ndif'#010+ + 'endif'#010+ #010+ '# Override defaults'#010+ 'AS=$(ASPROG)'#010+ - 'LD=$(LDPROG)'#010+ + 'LD=$(LDPRO','G)'#010+ 'RC=$(RCPROG)'#010+ 'AR=$(ARPROG)'#010+ 'NASM=$(NASMPROG)'#010+ @@ -1304,13 +1301,13 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# ldconfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ - 'LDC','ONFIG=ldconfig'#010+ + 'LDCONFIG=ldconfig'#010+ 'else'#010+ 'LDCONFIG='#010+ 'endif'#010+ #010+ 'ifdef DATE'#010+ - 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ + 'D','ATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ 'DATESTR='#010+ 'endif'#010+ @@ -1329,14 +1326,15 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ #010+ - '[','command_begin]'#010+ - '#####################################################################'#010+ + '[command_begin]'#010+ + '##################################','##################################'+ + '#'#010+ '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load commandline OPTDEF and add FPC_CPU define, for compil','ing the'#010+ + '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ - 'ifndef NOCPUDEF'#010+ + 'if','ndef NOCPUDEF'#010+ 'override FPCOPTDEF=$(ARCH)'#010+ 'endif'#010+ #010+ @@ -1346,8 +1344,8 @@ const fpcmakeini : array[0..242,1..240] of char=( 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ - 'ifneq (','$(CPU_TARGET),$(CPU_SOURCE))'#010+ - 'override FPCOPT+=-P$(ARCH)'#010+ + 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ + 'override FPCOPT+=-P$','(ARCH)'#010+ 'endif'#010+ #010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ @@ -1356,9 +1354,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ #010+ - 'ifnde','f CROSSBOOTSTRAP'#010+ + 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ + 'overr','ide FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ @@ -1367,7 +1365,7 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# When BINUTILSPREFIX is given and we are not cross-compiling then use'+ #010+ - '# it whi','le compiling the fpmake file. (For example to build i386-fre'+ + '# it while compiling the fpmake file. (For example to bui','ld i386-fre'+ 'ebsd'#010+ '# with BINUTILSPREFIX=i386-)'#010+ 'ifndef CROSSCOMPILE'#010+ @@ -1375,9 +1373,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)'#010+ 'override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)'#010+ 'endif'#010+ - 'end','if'#010+ + 'endif'#010+ #010+ - '# User dirs should be first, so they are looked at first'#010+ + '# User dirs should be first, so they are look','ed at first'#010+ 'ifdef UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ @@ -1385,10 +1383,10 @@ const fpcmakeini : array[0..242,1..240] of char=( 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,$(OBJ','DIR))'#010+ + 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ + 'override FPCOPT+=$(addpr','efix -Fi,$(INCDIR))'#010+ 'endif'#010+ #010+ '# Smartlinking'#010+ @@ -1403,11 +1401,11 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# Debug'#010+ 'ifdef DEBUG'#010+ - 'override FPCOPT','+=-gl'#010+ + 'override FPCOPT+=-gl'#010+ 'override FPCOPTDEF+=DEBUG'#010+ 'endif'#010+ #010+ - '# Release mode'#010+ + '# Release ','mode'#010+ '# (strip, optimize and don'#039't load fpc.cfg)'#010+ '# fpc 2.1 has -O2 for all targets'#010+ 'ifdef RELEASE'#010+ @@ -1415,9 +1413,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#010+ 'FPCCPUOPT:=-OG2p3'#010+ 'endif'#010+ - 'if','eq ($(CPU_TARGET),powerpc)'#010+ + 'ifeq ($(CPU_TARGET),powerpc)'#010+ 'FPCCPUOPT:=-O1r'#010+ - 'endif'#010+ + 'endif'#010, 'else'#010+ 'FPCCPUOPT:=-O2'#010+ 'endif'#010+ @@ -1432,10 +1430,10 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# Optimizer'#010+ 'ifdef OPTIMIZE'#010+ - 'override FPCOP','T+=-O2'#010+ + 'override FPCOPT+=-O2'#010+ 'endif'#010+ #010+ - '# Verbose settings (warning,note,info)'#010+ + '# Verbose settings (warning,note,in','fo)'#010+ 'ifdef VERBOSE'#010+ 'override FPCOPT+=-vwni'#010+ 'endif'#010+ @@ -1445,16 +1443,16 @@ const fpcmakeini : array[0..242,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+ - 'ifdef COMPILER_LIBRARYDIR'#010+ + 'ifdef COMPILER_LI','BRARYDIR'#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+ - 'overri','de FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR)',')'#010+ 'endif'#010+ #010+ '# Cross compiler utils'#010+ @@ -1464,8 +1462,8 @@ const fpcmakeini : array[0..242,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 ($(COMPILER_TARGETDIR),.)'#010+ + 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ + 'ifeq ($(COMPILER_TARGETDIR)',',.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ @@ -1474,16 +1472,16 @@ const fpcmakeini : array[0..242,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+ + 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ + 'ifeq ($(COMPILER_UNIT','TARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ - 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETD','IR)'#010+ - 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ + 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ + 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFI','X)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1493,9 +1491,9 @@ const fpcmakeini : array[0..242,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 li'+ - 'nux solaris),)'#010+ - 'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)'#010+ + 'ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linu'+ + 'x solaris),)'#010+ + 'ifneq ($(findstr','ing $(CPU_TARGET),x86_64 mips mipsel),)'#010+ 'override FPCOPT+=-Cg'#010+ 'endif'#010+ 'endif'#010+ @@ -1507,9 +1505,9 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '[command_libc]'#010+ '# Add GCC lib path if asked'#010+ - 'i','fdef GCCLIBDIR'#010+ + 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ - 'endif'#010+ + 'e','ndif'#010+ 'ifdef OTHERLIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ @@ -1521,7 +1519,7 @@ const fpcmakeini : array[0..242,1..240] of char=( 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Ov','erride options to compile the fpmake-binary with command-line op'+ + '# Override options to compile the fpmake-binary with ','command-line op'+ 'tions provided in FPMAKEBUILDOPT'#010+ 'ifdef FPMAKEBUILDOPT'#010+ 'override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)'#010+ @@ -1529,10 +1527,10 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ - 'override FPCOPT','+=$(addprefix -d,$(FPCOPTDEF))'#010+ + 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ #010+ - '# Was a config file specified ?'#010+ + '# Was a con','fig file specified ?'#010+ 'ifdef CFGFILE'#010+ 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ @@ -1540,11 +1538,11 @@ const fpcmakeini : array[0..242,1..240] of char=( '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ - 'override FPCOPT:=!FPCEXTCM','D'#010+ + 'override FPCOPT:=!FPCEXTCMD'#010+ 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ - 'override 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+ @@ -1552,19 +1550,19 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ 'ifdef ACROSSCOMPILE'#010+ - 'override FPCOPT+=$(CROS','SOPT)'#010+ + 'override FPCOPT+=$(CROSSOPT)'#010+ 'endif'#010+ #010+ '# Compiler commandline'#010+ - 'override COMPILER:=$(strip $(FPC) $(FPCOPT))'#010+ + 'override COMP','ILER:=$(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 (,$(findstring -s ,$(COMPILER)))'#010+ + 'ifneq (,$(findstring -s ,$(C','OMPILER)))'#010+ 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ 'UseEXECPPAS=1'#010+ 'endif'#010+ @@ -1577,19 +1575,20 @@ const fpcmakeini : array[0..242,1..240] of char=( 'else'#010+ 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ - 'e','ndif'#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_cle','an'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ @@ -1597,19 +1596,19 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '%$(OEXT): %$(LOADEREXT)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' $(AS) -o $(CO','MPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ + ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ - ' $(AS) -o $*$(OEXT) $<'#010+ + ' $','(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LO','ADEROFILE'+ - 'S))'#010+ + ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ + ')'#010+ 'else'#010+ - ' -$(DEL) $(LOADEROFILES)'#010+ + ' -$(DEL) $(LOADEROFILES)',#010+ 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ @@ -1617,8 +1616,8 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#010+ - 'els','e'#010+ - ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ + 'else'#010+ + ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UN','ITDIR)'#010+ 'endif'#010+ #010+ #010+ @@ -1627,45 +1626,45 @@ const fpcmakeini : array[0..242,1..240] of char=( '# Units'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_uni','ts'#010+ + '.PHONY: fpc_units'#010+ #010+ - 'ifneq ($(TARGET_UNITS)$(TARGET_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 INSTALLPPU','FILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ + 'ov','erride CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ #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+ - 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ - 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) '+ - '$(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PR'+ - 'O','GRAMS)))'#010+ - 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEOFILES:=','$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addpre'+ + 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ + ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ + 'PROGRAMS)))'#010+ + 'override EXEDBGFILES:=$(addsuffix $(EXED','BGEXT),$(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 $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ + 'ifeq ($(OS_TARGET),os2)'#010+ + 'override CLEANEXEFILES+=$(adds','uffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1673,67 +1672,65 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - 'fpc_exes: $(COMPILER_TARGETDIR) $(COMP','ILER_UNITTARGETDIR) $(EXEFILES'+ - ')'#010+ + 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+ #010+ #010+ '[rstrules]'#010+ - '#####################################################################'#010+ + '####','################################################################'+ + '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ #010+ 'ifdef TARGET_RSTS'#010+ - 'override RSTFILES','=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ + 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRSTFILES+=$(RSTFILES)'#010+ + 'override ','CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ #010+ #010+ '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '############################################################','########'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_examples'#010+ #010+ - 'ifneq ($(TARGET_EXAMPLES),)'#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 .dp','r,$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ + 'XAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLEFILES:=$(a','ddsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+ - '))) $(addpre','fix $(IMPORTLIBPREFIX),$(addsuffix $(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+=$(EXAMPLEDBG','FILES)'#010+ + 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'override CLEANEXEF','ILES+=$(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+ - 'HA','SEXAMPLES=1'#010+ + 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ - 'S))'#010+ + 'fpc_examples: all $(EXAMPLEFIL','ES) $(addsuffix _all,$(TARGET_EXAMPLED'+ + 'IRS))'#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+ + '.PHONY: fpc_al','l fpc_smart fpc_debug fpc_release fpc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1741,10 +1738,10 @@ const fpcmakeini : array[0..242,1..240] of char=( 'fpc_all: $(FPCMADE)'#010+ #010+ 'fpc_smart:'#010+ - ' $(MAKE) all LINK','SMART=1 CREATESMART=1'#010+ + ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ - ' $(MAKE) all DEBUG=1'#010+ + ' $(MAKE)',' all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ @@ -1752,10 +1749,10 @@ const fpcmakeini : array[0..242,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_UNITTARGETDIR):'#010+ - ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ + ' $','(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ @@ -1765,10 +1762,10 @@ const fpcmakeini : array[0..242,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ - ' ',' $(COMPILER) $<'#010+ + ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(EXEEXT): %.pp'#010+ + '%$(EXEEXT):',' %.pp'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ @@ -1780,24 +1777,25 @@ const fpcmakeini : array[0..242,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(EXEEXT): %.dpr',#010+ + '%$(EXEEXT): %.dpr'#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%.res: %.rc'#010+ + '%.re','s: %.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_INCLUD','EDIR)'#010+ - 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILE','R_INCLUDEDIR)'#010+ 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ - #010, + #010+ '[sharedrules]'#010+ - '#####################################################################'#010+ + '###################################','#################################'+ + '#'#010+ '# Library'#010+ '#####################################################################'#010+ #010+ @@ -1805,9 +1803,9 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ 'override INSTALLTARGET+=fpc_shared_install'#010+ #010+ - 'ifndef SHAR','ED_LIBVERSION'#010+ + 'ifndef SHARED_LIBVERSION'#010+ 'SHARED_LIBVERSION=$(FPC_VERSION)'#010+ - 'endif'#010+ + 'en','dif'#010+ #010+ 'ifndef SHARED_LIBNAME'#010+ 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ @@ -1818,8 +1816,8 @@ const fpcmakeini : array[0..242,1..240] of char=( 'N)$(SHAREDLIBEXT)'#010+ 'endif'#010+ #010+ - '# Defaul','t sharedlib units are all unit objects'#010+ - 'ifndef SHARED_LIBUNITS'#010+ + '# Default sharedlib units are all unit objects'#010+ + 'ifndef SHA','RED_LIBUNITS'#010+ 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ @@ -1827,34 +1825,35 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ 'fpc_shared:'#010+ 'ifdef HASSHAREDLIB'#010+ - ' ',' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ + ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREA','TESMART=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 Li','braries 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'+ - 'A','LL_SHAREDDIR)'#010+ + 'ALL_SHAREDDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ '[installrules]'#010+ - '#####################################################################'#010+ + '#','###################################################################'+ + '#'#010+ '# Install rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_install fpc_sourceinsta','ll fpc_exampleinstall'#010+ + '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'overri','de INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALL_BUILDUNIT'#010+ @@ -1862,18 +1861,18 @@ const fpcmakeini : array[0..242,1..240] of char=( '(INSTALLPPUFILES))'#010+ 'endif'#010+ #010+ - 'ifde','f INSTALLPPUFILES'#010+ - 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+ - ',$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT)'+ - ',$(STATICLIB','EXT),$(INSTALLPPUFILES)))'#010+ - 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ + 'ifdef INSTALLPPUFILES'#010+ + 'override INSTALLPPULINKFILES:=$','(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ + 'FILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ + 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ + 'ifneq ($(UNITTARGETDIRP','REFIX),)'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ '$(INSTALLPPUFILES)))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ - 'EFIX),$(notdir $(INST','ALLPPULINKFILES))))'#010+ + 'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ - '# Implicitly install Package.fpc'#010+ + '# Implicitly install Pa','ckage.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ @@ -1881,24 +1880,24 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifneq ($(TARGETDIRPREFIX),)'#010+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ 'STALLEXEFILES)))'#010+ - 'e','ndif'#010+ + 'endif'#010+ 'endif'#010+ #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ - 'ifdef INSTALLEXEFILES'#010+ + 'ifd','ef INSTALLEXEFILES'#010+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ - '# If the fpcpackage variabl','e is set then create and install Package.'+ - 'fpc,'#010+ - '# a safety check is done if Makefile.fpc is available'#010+ + '# If the fpcpackage variable is set then create and install Package.fp'+ + 'c,'#010+ + '# a',' safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ - ' $(MKDIR) $(I','NSTALL_UNITDIR)'#010+ - ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) Package.fpc $(','INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1907,43 +1906,43 @@ const fpcmakeini : array[0..242,1..240] of char=( ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ - ' ',' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_','UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -sf $(LIB_FULLNAME) $(INSTA','LL_LIBDIR)/$(LIB_NAME)'#010+ + ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALL_FILES'#010+ + 'ifdef IN','STALL_FILES'#010+ ' $(MKDIR) $(INSTALL_DATADIR)'#010+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ - ' $(COPY','TREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ + ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+ - 'ARGET_EXAMPLEDIRS))'#010+ + 'fpc_exam','pleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$'+ + '(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ - ' $(COPY) $(EXA','MPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ + ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ - 'ifdef TARGET_EXAMPLEDIRS'#010+ + 'ifde','f TARGET_EXAMPLEDIRS'#010+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ 'AMPLEDIR)'#010+ 'endif'#010+ #010+ '[distinstallrules]'#010+ - '################################################################','####'+ - '#'#010+ - '# Dist Install'#010+ '#####################################################################'#010+ + '# Dist Install'#010+ + '############################','########################################'+ + '#'#010+ #010+ '.PHONY: fpc_distinstall'#010+ #010+ @@ -1951,17 +1950,16 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ #010+ '[zipinstallrules]'#010+ - '###############################################################','#####'+ - '#'#010+ - '# Zip'#010+ '#####################################################################'#010+ + '# Zip'#010+ + '####################################','################################'+ + '#'#010+ #010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ - '# subdir, because the deltree',' can'#039't see the whole tree to remove'+ - #010+ - 'ifndef PACKDIR'#010+ + '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ + 'ifndef PACKDI','R'#010+ 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ @@ -1972,13 +1970,13 @@ const fpcmakeini : array[0..242,1..240] of char=( '# Maybe create default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ - 'ZIPNAME=$(DIST_ZIPNAME',')'#010+ + 'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'else'#010+ 'ZIPNAME=$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ - 'ifndef FULLZIPNAME'#010+ + 'ifnde','f FULLZIPNAME'#010+ 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ @@ -1989,10 +1987,10 @@ const fpcmakeini : array[0..242,1..240] of char=( 'else'#010+ 'ZIPTARGET=install'#010+ 'endif'#010+ - 'en','dif'#010+ + 'endif'#010+ #010+ '# Use tar by default under linux'#010+ - 'ifndef USEZIP'#010+ + 'ifndef USEZ','IP'#010+ 'ifdef inUnix'#010+ 'USETAR=1'#010+ 'endif'#010+ @@ -2004,23 +2002,24 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# We need to be able to run in the current OS so fix'#010+ - '# the path separator',#010+ + '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ + 'ZIPWRA','PPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)'+ + ')'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ - 'ZIP','CMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ + 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR)',')'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ - 'ZIPCMD_ZIP:=$','(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+ + 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) ','$(ZIPD'+ 'ESTFILE) *'#010+ 'endif'#010+ #010+ @@ -2028,14 +2027,14 @@ const fpcmakeini : array[0..242,1..240] of char=( ' $(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+ + 'ifdef USEZIPWRAPPER'#010+ + '# Handle gecho separate as we need to espace \ wi','th \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ - ' $(ECHOR','EDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRA'+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZI','PWRA'+ 'PPER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ @@ -2043,10 +2042,10 @@ const fpcmakeini : array[0..242,1..240] of char=( ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ - ' /bin/sh $(ZI','PWRAPPER)'#010+ + ' /bin/sh $(ZIPWRAPPER)'#010+ 'else'#010+ 'ifdef RUNBATCH'#010+ - ' $(RUNBATCH) $(ZIPWRAPPER)'#010+ + ' $(RUNBATCH)',' $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPWRAPPER)'#010+ 'endif'#010+ @@ -2057,9 +2056,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ - 'fpc_zi','psourceinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ - 'SOURCESUFFIX)'#010+ + 'fpc_zipsourceinstall:'#010+ + ' $(MAKE) fpc_zipinstall ZI','PTARGET=sourceinstall ZIPSUFFIX=$(Z'+ + 'IPSOURCESUFFIX)'#010+ #010+ 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ @@ -2067,8 +2066,8 @@ const fpcmakeini : array[0..242,1..240] of char=( 'PEXAMPLESUFFIX)'#010+ 'endif'#010+ #010+ - 'fpc_z','ipdistinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+ + 'fpc_zipdistinstall:'#010+ + ' $(MAKE) fpc_zipinstall ZIP','TARGET=distinstall'#010+ #010+ #010+ '[cleanrules]'#010+ @@ -2076,9 +2075,9 @@ const fpcmakeini : array[0..242,1..240] of char=( '# Clean rules'#010+ '#####################################################################'#010+ #010+ - '.P','HONY: fpc_clean fpc_cleanall fpc_distclean'#010+ + '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ - 'ifdef EXEFILES'#010+ + 'ifdef',' EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ '))'#010+ 'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+ @@ -2086,37 +2085,37 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEAN_PROGRAMS'#010+ - 'o','verride CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $'+ + 'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPRE','FIX),$(addsuffix $'+ '(EXEEXT), $(CLEAN_PROGRAMS)))'#010+ 'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+ '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ 'endif'#010+ #010+ 'ifdef CLEAN_UNITS'#010+ - 'override CLEAN','PPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ - 'endif'#010+ + 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+ + 'e','ndif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+ - 'LEANPPUFILES))) $(addpref','ix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ - 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+ + 'LEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STA'+ + 'TICL','IBEXT),$(CLEANPPUFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'UFILES))'#010+ 'endif'#010+ - 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(C','LEANPP'+ - 'UFILES))'#010+ - 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ - 'IX),$(CLEANPPULINKFILES)))'#010+ + 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ + 'ILES))'#010+ + 'override CLEANPPULINKFILES:=$(wild','card $(addprefix $(UNITTARGETDIRPR'+ + 'EFIX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#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 instead of DEL because on Mac OS X these are directories'#010+ + 'ifdef CLEANEXEDBGF','ILES'#010+ ' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ @@ -2125,8 +2124,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef CL','EANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ + 'ifdef CLEANRSTFILES'#010+ + ' -$(DEL) $(addprefix $(UNITTAR','GETDIRPREFIX),$(CLEANRSTFILES))'+ + #010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+ @@ -2134,8 +2134,8 @@ const fpcmakeini : array[0..242,1..240] of char=( 'ifdef LIB_NAME'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ - ' -$(DEL) $(FPCMADE) Packag','e.fpc $(PPAS) script.res link.res $'+ - '(FPCEXTFILE) $(REDIRFILE)'#010+ + ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ + 'PCEXTFILE) $','(REDIRFILE)'#010+ ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET)'#010+ @@ -2143,10 +2143,10 @@ const fpcmakeini : array[0..242,1..240] of char=( ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'ifdef CLEANPPUFI','LES'#010+ + 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES),)'#010+ + 'ifneq ','($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ @@ -2154,26 +2154,26 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ - ' ',' -$(DEL) $(CLEAN_FILES)'#010+ + ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ - ' -$(DELTREE) units'#010+ + ' -$(DELTRE','E) units'#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'+ - 'CEXTFILE) $(REDIRFILE)'#010+ + ' -$(DELTREE) *$(SMARTEXT)'#010+ + ' -$(DEL) fpcmade.* Package.fp','c $(PPAS) script.res link.res $('+ + 'FPCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ 'ifdef DEBUGSYMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ - 'en','dif'#010+ + 'endif'#010+ 'ifdef LOCALFPMAKEBIN'#010+ - ' -$(DEL) $(LOCALFPMAKEBIN)'#010+ + ' -$(DEL) $(LOCALF','PMAKEBIN)'#010+ ' -$(DEL) $(FPMAKEBINOBJ)'#010+ 'endif'#010+ #010+ @@ -2183,7 +2183,7 @@ const fpcmakeini : array[0..242,1..240] of char=( '[baseinforules]'#010+ '#####################################################################'#010+ '# Base info rules'#010+ - '############','########################################################'+ + '#############################################################','#######'+ '#'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ @@ -2194,94 +2194,94 @@ const fpcmakeini : array[0..242,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 CP','U... $(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. $(SOURCESUFFIX)'#010+ + ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ + ' @$(ECHO) SourceSuffix. $(SOURCE','SUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ',' Required pkgs... $(REQUIRE_PACKAGES)'#010+ - ' @$(ECHO)'#010+ + ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ + ' @$(','ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ - ' @$(ECHO) UnitsDir........ $(UNITSDI','R)'#010+ - ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ + ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ + ' @$(ECHO) PackagesDir..... $(PACKAGESD','IR)'#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) GInstall.. $(GINSTALL)'#010+ + ' @$(ECHO) Rm........ $(RMPROG)'#010+ + ' @$(ECHO) ','GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ - ' @$(ECHO)',' PPUMove... $(PPUMOVE)'#010+ - ' @$(ECHO) Zip....... $(ZIPPROG)'#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.......... $(TARG','ET_UNITS)'#010+ - ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ + ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ + ' @$(ECHO) Target Implicit Units','. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @$(ECHO) Target Examples....... $(TARGET','_EXAMPLES)'#010+ - ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#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) Instal','l Units....... $(INSTALL_UNITS)'#010+ - ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ + ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ + ' @$(ECHO) ',' Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' @$(ECHO) ZipName.....','......... $(ZIPNAME)'#010+ - ' @$(ECHO) 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) 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.. $(IN','STALL_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.. $(INSTAL','L_EXAMPLEDIR)'#010+ - ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#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+ #010+ '[inforules]'#010+ - '########','############################################################'+ + '#########################################################','###########'+ '#'#010+ '# Info rules'#010+ '#####################################################################'#010+ @@ -2291,9 +2291,8 @@ const fpcmakeini : array[0..242,1..240] of char=( 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ - '####################################','################################'+ - '#'#010+ - '# Rebuild Makefile'#010+ + '#####################################################################'#010+ + '# Rebuild Makef','ile'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ @@ -2301,18 +2300,18 @@ const fpcmakeini : array[0..242,1..240] of char=( ' fpc_makefile_dirs'#010+ #010+ 'fpc_makefile:'#010+ - ' ',' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ - #010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ + #010, 'fpc_makefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsu','ffix /Makefile.fpc,$(TAR'+ - 'GET_EXAMPLEDIRS))'#010+ + ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ + 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ - #010+ + #010, 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ 'EXAMPLEDIRS))'#010+ #010+ @@ -2320,8 +2319,9 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ - '[lo','calmakefile]'#010+ - '#####################################################################'#010+ + '[localmakefile]'#010+ + '####################################','################################'+ + '#'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ #010+ @@ -2330,15 +2330,17 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ #010+ - '[userrul','es]'#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+ @@ -2349,9 +2351,9 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ 'endif'#010+ 'export LCL_PLATFORM'#010+ - #010, + #010+ '# Check if the specified LCLDIR is correct'#010+ - 'ifdef LCLDIR'#010+ + 'ifdef ','LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ @@ -2360,9 +2362,9 @@ const fpcmakeini : array[0..242,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 correct'#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+ @@ -2370,7 +2372,7 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# Check for development version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(','subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildc','a'+ 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ @@ -2379,7 +2381,7 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ '# Check for release version'#010+ 'ifeq ($(LCLDIR),wrong)'#010+ - 'override LCLDIR=$(','subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildc','a'+ 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ @@ -2387,93 +2389,92 @@ const fpcmakeini : array[0..242,1..240] of char=( 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(L','CL_PLATFORM) $(LC'+ - 'LDIR)/units)'#010+ - 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ - 'nts $(LCLDIR)/components)'#010+ + 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ + 'IR)/units)'#010+ + 'override LCLCOMPONE','NTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo'+ + 'nents $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)',#010+ + 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ - '[lclinforules]'#010+ + '[lclin','forules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ - 'override INFORULES+=lclin','fo'#010+ + 'override INFORULES+=lclinfo'#010+ #010+ '.PHONY: 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.... $(LCLCOMPONENTDIR)'#010+ + ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ + ' @$(ECHO) LCL Component dir.... $(LCLCOMP','ONENTDIR)'#010+ ' @$(ECHO)'#010+ #010+ '[fpmakeprerules]'#010+ '#####################################################################'#010+ '# fpmake prerules'#010+ - '##########################################################','##########'+ - '#'#010+ + '#####################################################################'#010+ 'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+ - 'FPMAKEBINOBJ=fpmake$(OEXT)'#010+ + 'FPMAKEBI','NOBJ=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+ + 'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+ 'endif'#010+ 'ifdef CPU_TARGET'#010+ - 'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+ + 'FPC_TARGETOPT+=--cpu=$(C','PU_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,$(PACKAGESDI','R))))))'#010+ + 'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+ 'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+ - 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFFIX'+ - ')'#010+ + 'UNITDIR_F','PMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+ + 'IX)'#010+ 'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+ 'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+ - 'FPMKUNIT_PPU=$(U','NITDIR_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:=$(filter-out -FE%,$(FPCOPT))'#010+ + 'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+ + 'override FPCOPT:=$(fil','ter-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+=--globalunitdir=$(FPCDIR)/packages'#010+ 'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+ - 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+ + 'FPMAKE_OPT+=$(addpre','fix -o ,$(FPCOPT))'#010+ 'FPMAKE_OPT+=--compiler=$(FPC)'#010+ 'FPMAKE_OPT+=-bu'#010+ #010+ 'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+ 'ifdef UNIXHier'#010+ 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+ - 'FPMAKE_','INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VER'+ + 'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/f','pc/$(FPC_VER'+ 'SION)'#010+ 'else'#010+ 'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+ @@ -2481,22 +2482,22 @@ const fpcmakeini : array[0..242,1..240] of char=( #010+ 'override ALLTARGET+=fpc_fpmake'#010+ 'override INSTALLTARGET+=fpc_fpmake_install'#010+ - 'override EXAMPLEINSTALLTARGET+=fpc_fpma','ke_exampleinstall'#010+ - '# If no fpmake exists and (dist)clean is called, do not try to build f'+ - 'pmake, it will'#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+ '# most often fail because the dependencies are cleared.'#010+ '# In case of a clean, simply do nothing'#010+ 'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+ - 'ov','erride CLEANTARGET+=fpc_fpmake_clean'#010+ + 'override CLEANTARGET+=fpc_fpmake_clean'#010+ 'endif'#010+ #010+ - '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+ + '$(FPM','KUNIT_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_UNI'+ - 'TDIR)) $(FPMAKE_BUILD_OPT)'#010+ + ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+ + 'IR)) $(','FPMAKE_BUILD_OPT)'#010+ #010+ 'fpc_fpmake: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+ @@ -2504,15 +2505,15 @@ const fpcmakeini : array[0..242,1..240] of char=( 'fpc_fpmake_clean: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+ #010+ - 'fpc_fpmake_i','nstall: $(FPMAKEBIN)'#010+ - ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+ - 'PT)'#010+ + 'fpc_fpmake_install: $(FPMAKEBIN)'#010+ + ' $(LOCALFPMAKEBIN',') install $(FPMAKE_OPT) $(FPMAKE_INSTALL'+ + '_OPT)'#010+ #010+ '# This is not completely valid. Exampleinstall should only install the'+ ' examples, while'#010+ - '# fpmake -ie installs everything, including the examples.',' This also '+ - 'means that on'#010+ - '# a distinstall fpmake install wil be called twice.'#010+ + '# fpmake -ie installs everything, including the examples. This also me'+ + 'ans that on'#010+ + '# a distinstall fpmake i','nstall wil be called twice.'#010+ 'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+ ' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+ 'LL_OPT)'#010