diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2014-07-05 09:06:44 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2014-07-05 09:06:44 +0400 |
| commit | 6d4345f8fc609e62d37d9947d67e0b79f491bf7a (patch) | |
| tree | b2b93d5ccd1ed0be48cd92a980da130736aa6948 | |
| parent | fe9ff9d147ce144743b1818be1e073a93aefd2d2 (diff) | |
| download | fpc-6d4345f8fc609e62d37d9947d67e0b79f491bf7a.tar.gz | |
Updated dyson-fpcmake.ini.patchdyson/2.6.4+dfsg-3_dyson1
| -rw-r--r-- | debian/patches/dyson-fpcmake.ini.patch | 2130 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
2 files changed, 2125 insertions, 7 deletions
diff --git a/debian/patches/dyson-fpcmake.ini.patch b/debian/patches/dyson-fpcmake.ini.patch index 653ab074..1cc2ec18 100644 --- a/debian/patches/dyson-fpcmake.ini.patch +++ b/debian/patches/dyson-fpcmake.ini.patch @@ -1,8 +1,2126 @@ -Index: fpc/fpcsrc/utils/fpcm/fpcmake.ini -=================================================================== ---- fpc.orig/fpcsrc/utils/fpcm/fpcmake.ini 2014-07-02 22:36:10.055750242 +0400 -+++ fpc/fpcsrc/utils/fpcm/fpcmake.ini 2014-07-03 22:16:56.645890449 +0400 -@@ -302,6 +302,10 @@ +Description: use linuxHier=1 on Dyson +--- fpc-2.6.4+dfsg.orig/fpcsrc/utils/fpcm/fpcmake.inc ++++ fpc-2.6.4+dfsg/fpcsrc/utils/fpcm/fpcmake.inc +@@ -319,13 +319,17 @@ const fpcmakeini : array[0..216,1..240] + 'linuxHier=1'#010+ + 'endif'#010+ + #010+ +- 'export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TAR','GET FU'+ ++ 'ifeq ($(OS_TARGET),solaris)'#010+ ++ 'linuxHier=1'#010+ ++ 'endif'#010+ ++ #010+ ++ 'export OS_TARGE','T OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FU'+ + 'LL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE'#010+ + #010+ + '[fpmakefpcdetect]'#010+ + '#####################################################################'#010+ + '# FPC Binary and Version Detection'#010+ +- '#############################################################','#######'+ ++ '##############','######################################################'+ + '#'#010+ + '# If FPCFPMAKE is not set and we'#039're cross-compiling, try to find a'+ + #010+ +@@ -333,39 +337,39 @@ const fpcmakeini : array[0..216,1..240] + 'ifndef FPCFPMAKE'#010+ + #010+ + 'ifdef CROSSCOMPILE'#010+ +- '# Search for the (native) ppc compiler which is used to do the latest '+ +- 'build'#010+ ++ '# Search for the (native) ppc compiler which is used to do th','e lates'+ ++ 't build'#010+ + '# of the native rtl'#010+ + #010+ +- 'ifeq ($(str','ip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPC'+ +- 'DIR)))),)'#010+ ++ 'ifeq ($(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(FPCDI'+ ++ 'R)))),)'#010+ + '# If that compiler is not found, use the common, installed native comp'+ + 'iler'#010+ +- '# Note that in this case FPCFPMAKE is not exported, because it could b'+ +- 'e that'#010+ +- '# a more suitable com','piler is compiled later on'#010+ ++ '# Note that in this case FPCFPMAKE is not exported,',' because it could'+ ++ ' be that'#010+ ++ '# a more suitable compiler is compiled later on'#010+ + '# check if fpc exists'#010+ + 'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+ + ')))'#010+ + 'ifneq ($(FPCPROG),)'#010+ + 'FPCPROG:=$(firstword $(FPCPROG))'#010+ +- 'FPCFPMAKE:=$(shell $(FPCPROG) -PB)'#010+ +- '# if a native compiler is not',' found, fall back to fpc'#010+ ++ 'FPCFPMAKE:=$(shel','l $(FPCPROG) -PB)'#010+ ++ '# if a native compiler is not found, fall back to fpc'#010+ + 'ifeq ($(strip $(wildcard $(FPCFPMAKE))),)'#010+ + 'FPCFPMAKE:=$(firstword $(FPCPROG))'#010+ + 'endif'#010+ + 'else'#010+ + '# fpc binary not found, fallback to ppc386'#010+ +- 'override FPCFPMAKE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$'+ +- '(SRCEXEEXT),$(','SEARCHPATH)))))'#010+ ++ 'override FPCFPMAKE=$(firstword $(stri','p $(wildcard $(addsuffix /ppc38'+ ++ '6$(SRCEXEEXT),$(SEARCHPATH)))))'#010+ + 'endif'#010+ + 'else'#010+ + '# Use the ppc compiler. Because the path to the compiler is relative, '+ + 'do not'#010+ + '# evaluate the variable here, but do that on the fly.'#010+ +- 'FPCFPMAKE=$(strip $(wildcard $(addsuffix /compiler/ppc$(SRCEXEEXT),$(F'+ +- 'PCDIR))))'#010+ +- 'FP','MAKE_SKIP_CONFIG=-n'#010+ ++ 'FPCFPMAKE=$(strip $(wildcard $(adds','uffix /compiler/ppc$(SRCEXEEXT),$'+ ++ '(FPCDIR))))'#010+ ++ 'FPMAKE_SKIP_CONFIG=-n'#010+ + 'export FPCFPMAKE'#010+ + 'export FPMAKE_SKIP_CONFIG'#010+ + 'endif'#010+ +@@ -379,17 +383,17 @@ const fpcmakeini : array[0..216,1..240] + #010+ + #010+ + '[fpcdircheckenv]'#010+ +- '#####################################################################'#010+ +- '# FPCDIR Setting'#010+ +- '#######','#############################################################'+ ++ '###############################################','#####################'+ + '#'#010+ ++ '# FPCDIR Setting'#010+ ++ '#####################################################################'#010+ + #010+ + '# Test FPCDIR to look if the RTL dir exists'#010+ + 'ifdef FPCDIR'#010+ + 'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+ +- 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ ++ 'ifeq ($(wildcard $(addprefix $(F','PCDIR)/,rtl units)),)'#010+ + 'override FPCDIR=wrong'#010+ +- 'end','if'#010+ ++ 'endif'#010+ + 'else'#010+ + 'override FPCDIR=wrong'#010+ + 'endif'#010+ +@@ -398,8 +402,8 @@ const fpcmakeini : array[0..216,1..240] + 'ifdef DEFAULT_FPCDIR'#010+ + 'ifeq ($(FPCDIR),wrong)'#010+ + 'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+ +- 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ +- 'override FPCDIR=wrong'#010, ++ 'ifeq ($(wildcard $(addprefix ','$(FPCDIR)/,rtl units)),)'#010+ ++ 'override FPCDIR=wrong'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ +@@ -410,15 +414,15 @@ const fpcmakeini : array[0..216,1..240] + 'ifdef inUnix'#010+ + 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ + 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ +- 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ ++ 'override FPCDIR=/usr/','lib/fpc/$(FPC_VERSION)'#010+ + 'endif'#010+ + 'else'#010+ +- 'override FPCD','IR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(a'+ +- 'ddsuffix /$(FPC),$(SEARCHPATH))))))'#010+ ++ 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+ ++ 'suffix /$(FPC),$(SEARCHPATH))))))'#010+ + 'override FPCDIR:=$(FPCDIR)/..'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ +- 'override FPCDIR:=$(FPCDIR)/..'#010+ +- 'ifeq ($(wildcard $(addprefix $(FPCD','IR)/,rtl units)),)'#010+ ++ 'override FPCDIR:=$','(FPCDIR)/..'#010+ ++ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ + 'override FPCDIR:=$(BASEDIR)'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ + 'override FPCDIR=c:/pp'#010+ +@@ -429,19 +433,19 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '# Cross binaries dir'#010+ +- 'ifndef CROSSBINDIR'#010+ +- 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGET','SUFFIX))'#010+ ++ 'ifndef CROSSBINDIR',#010+ ++ 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(TARGETSUFFIX))'#010+ + 'endif'#010+ + #010+ + '# Default binutils prefix for cross compile when the'#010+ + '# crossbindir is not set (except for Darwin)'#010+ + 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+ +- 'ifeq ($(OS_SOURCE),darwin)'#010+ ++ 'ifeq ($(OS_SOURCE),darwin)',#010+ + 'DARWIN2DARWIN=1'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ +- 'ifndef BINUTILSPR','EFIX'#010+ ++ 'ifndef BINUTILSPREFIX'#010+ + 'ifndef CROSSBINDIR'#010+ + 'ifdef CROSSCOMPILE'#010+ + 'ifndef DARWIN2DARWIN'#010+ +@@ -452,24 +456,24 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '# Try first the full target name, otherwise try only'#010+ +- '# the OS for backwards compatibility'#010+ +- 'UNITSDIR:=$(wildca','rd $(FPCDIR)/units/$(TARGETSUFFIX))'#010+ ++ '# the OS',' for backwards compatibility'#010+ ++ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(TARGETSUFFIX))'#010+ + 'ifeq ($(UNITSDIR),)'#010+ + 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ + 'endif'#010+ + #010+ + '# Packages dir'#010+ +- 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/package'+ +- 's/base $(FPCDIR)/packages/extra)'#010+ ++ 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/p','acka'+ ++ 'ges/base $(FPCDIR)/packages/extra)'#010+ + #010+ + #010+ +- '[shell','tools]'#010+ ++ '[shelltools]'#010+ + '#####################################################################'#010+ + '# Shell tools'#010+ + '#####################################################################'#010+ + #010+ +- '# Echo that can redir (must be able run in the default OS shell)'#010+ +- 'ifndef ECHORE','DIR'#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+ +@@ -485,11 +489,11 @@ const fpcmakeini : array[0..216,1..240] + '# Copy a whole tree'#010+ + 'ifndef COPYTREE'#010+ + 'COPYTREE:=$(CPPROG) -Rfp'#010+ +- 'endif'#010+ ++ 'endif'#010, + #010+ + '# Copy a whole tree'#010+ + 'ifndef MKDIRTREE'#010+ +- 'MKDIRTREE',':=$(MKDIRPROG) -p'#010+ ++ 'MKDIRTREE:=$(MKDIRPROG) -p'#010+ + 'endif'#010+ + #010+ + '# To move pograms'#010+ +@@ -504,11 +508,11 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '# Check deltree program'#010+ + 'ifndef DELTREE'#010+ +- 'DELTREE:=$(RMPROG) -rf'#010+ ++ 'DELTREE:=$(RMP','ROG) -rf'#010+ + 'endif'#010+ + #010+ + '# To install files'#010+ +- 'ifndef INSTA','LL'#010+ ++ 'ifndef INSTALL'#010+ + 'ifdef inUnix'#010+ + 'INSTALL:=$(GINSTALL) -c -m 644'#010+ + 'else'#010+ +@@ -521,12 +525,12 @@ const fpcmakeini : array[0..216,1..240] + 'ifdef inUnix'#010+ + 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ + 'else'#010+ +- 'INSTALLEXE:=$(COPY)'#010+ ++ 'INSTALLEXE:=$(COPY)',#010+ + 'endif'#010+ + 'endif'#010+ + #010+ + '# To make a directory.'#010+ +- 'ifndef MKD','IR'#010+ ++ 'ifndef MKDIR'#010+ + 'MKDIR:=$(GINSTALL) -m 755 -d'#010+ + 'endif'#010+ + #010+ +@@ -535,10 +539,10 @@ const fpcmakeini : array[0..216,1..240] + #010+ + #010+ + '[defaultdirs]'#010+ +- '#####################################################################'#010+ +- '# Default Directories'#010+ +- '####################','################################################'+ ++ '#################################################################','###'+ + '#'#010+ ++ '# Default Directories'#010+ ++ '#####################################################################'#010+ + #010+ + '# Units dir'#010+ + 'ifdef REQUIRE_UNITSDIR'#010+ +@@ -547,20 +551,20 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '# Units dir'#010+ + 'ifdef REQUIRE_PACKAGESDIR'#010+ +- 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ ++ 'override PACKAGESDIR+=$','(REQUIRE_PACKAGESDIR)'#010+ + 'endif'#010+ + #010+ + #010+ +- '# Unixes use unix',' dirs with /usr/bin, /usr/lib'#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+ + '# Zipinstall'#010+ +- 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+ ++ 'ifneq ($(findstring $(OS_TARGET),$(','UNIXs)),)'#010+ + 'UNIXHier=1'#010+ + 'endif'#010+ + 'else'#010+ +- '# Normal instal','l'#010+ ++ '# Normal install'#010+ + 'ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)'#010+ + 'UNIXHier=1'#010+ + 'endif'#010+ +@@ -571,9 +575,9 @@ const fpcmakeini : array[0..216,1..240] + 'ifdef PREFIX'#010+ + 'INSTALL_PREFIX=$(PREFIX)'#010+ + 'endif'#010+ +- 'endif'#010+ ++ 'endif',#010+ + #010+ +- '# set the prefix directory where to install e','verything'#010+ ++ '# set the prefix directory where to install everything'#010+ + 'ifndef INSTALL_PREFIX'#010+ + 'ifdef UNIXHier'#010+ + 'INSTALL_PREFIX=/usr/local'#010+ +@@ -585,9 +589,9 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ +- 'export INSTALL_PREFIX'#010+ ++ 'export INSTA','LL_PREFIX'#010+ + #010+ +- '# Export also INSTALL_SOURCESUBDIR s','et so it will be'#010+ ++ '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+ + '# used recursively for all subdirs'#010+ + 'ifdef INSTALL_FPCSUBDIR'#010+ + 'export INSTALL_FPCSUBDIR'#010+ +@@ -595,11 +599,11 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '# Where to place the resulting zip files'#010+ + 'ifndef DIST_DESTDIR'#010+ +- 'DIST_DESTDIR:=$(BASEDIR)'#010+ ++ 'DIST_DESTDIR:=$(BASEDIR)',#010+ + 'endif'#010+ + 'export DIST_DESTDIR'#010+ + #010+ +- '# EXE/PPU Target di','rectories'#010+ ++ '# EXE/PPU Target directories'#010+ + 'ifndef COMPILER_UNITTARGETDIR'#010+ + 'ifdef PACKAGEDIR_MAIN'#010+ + 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ +@@ -607,17 +611,17 @@ const fpcmakeini : array[0..216,1..240] + 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ + 'endif'#010+ + 'endif'#010+ +- 'ifndef COMPILER_TARGETDIR'#010+ ++ 'ifnde','f COMPILER_TARGETDIR'#010+ + 'COMPILER_TARGETDIR=.'#010+ +- 'endif',#010+ ++ 'endif'#010+ + #010+ + #010+ + '#####################################################################'#010+ + '# Install Directories'#010+ + '#####################################################################'#010+ + #010+ +- '# set the base directory where to install everything'#010+ +- 'ifndef INSTALL_BASEDI','R'#010+ ++ '# set the base directory wh','ere to install everything'#010+ ++ 'ifndef INSTALL_BASEDIR'#010+ + 'ifdef UNIXHier'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ +@@ -625,42 +629,42 @@ const fpcmakeini : array[0..216,1..240] + 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ + 'endif'#010+ + 'else'#010+ +- 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+ ++ 'INSTALL_BASEDIR:=$(INS','TALL_PREFIX)'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ +- '# set the directory w','here to install the binaries'#010+ ++ '# set the directory where to install the binaries'#010+ + 'ifndef INSTALL_BINDIR'#010+ + 'ifdef UNIXHier'#010+ + 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ + 'else'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ +- '# for FPC packages install the binaries under their target subdir'#010+ ++ '# for FPC packages install the binaries under',' their target subdir'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ +- 'i','fdef CROSSCOMPILE'#010+ ++ 'ifdef CROSSCOMPILE'#010+ + 'ifdef CROSSINSTALL'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+ + 'else'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ + 'endif'#010+ + 'else'#010+ +- 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ ++ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARG','ETSUFFIX)'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ +- '# set the di','rectory where to install the units.'#010+ ++ '# set the directory where to install the units.'#010+ + 'ifndef INSTALL_UNITDIR'#010+ + 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ + 'ifdef PACKAGE_NAME'#010+ +- 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ ++ 'INSTALL_UNITDIR:=$(INSTALL_UNITD','IR)/$(PACKAGE_NAME)'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ +- '# Where ','to install shared libraries'#010+ ++ '# Where to install shared libraries'#010+ + 'ifndef INSTALL_LIBDIR'#010+ + 'ifdef UNIXHier'#010+ + 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+ +@@ -669,10 +673,10 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'endif'#010+ + #010+ +- '# Where the source files will be stored'#010+ ++ '# Where the source files will be stor','ed'#010+ + 'ifndef INSTALL_SOURCEDIR'#010+ + 'ifdef UNIXHier'#010+ +- 'ifde','f BSDhier'#010+ ++ 'ifdef BSDhier'#010+ + 'SRCPREFIXDIR=share/src'#010+ + 'else'#010+ + 'ifdef linuxHier'#010+ +@@ -683,26 +687,26 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ + 'ifdef INSTALL_FPCSUBDIR'#010+ +- 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ +- ')/$(INSTAL','L_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ ++ 'INSTALL_SOURCEDIR:=$(INSTALL_PREF','IX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSI'+ ++ 'ON)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ + 'else'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ + ')/$(PACKAGE_NAME)'#010+ + 'endif'#010+ + 'else'#010+ +- 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ +- '(PACKAGE_VERSION)'#010+ ++ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKA','GE_NAME)'+ ++ '-$(PACKAGE_VERSION)'#010+ + 'endif'#010+ + 'else'#010+ +- 'ifdef IN','STALL_FPCPACKAGE'#010+ ++ 'ifdef INSTALL_FPCPACKAGE'#010+ + 'ifdef INSTALL_FPCSUBDIR'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+ + 'CKAGE_NAME)'#010+ + 'else'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ +- 'endif'#010+ ++ 'endi','f'#010+ + 'else'#010+ +- 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/so','urce'#010+ ++ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ +@@ -716,19 +720,19 @@ const fpcmakeini : array[0..216,1..240] + 'ifdef linuxHier'#010+ + 'DOCPREFIXDIR=share/doc'#010+ + 'else'#010+ +- 'DOCPREFIXDIR=doc'#010+ ++ 'DOCPREFIX','DIR=doc'#010+ + 'endif'#010+ + 'endif'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ +- 'IN','STALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/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+ + 'endif'#010+ + 'else'#010+ +- 'ifdef INSTALL_FPCPACKAGE'#010+ +- 'INSTALL_DOCDIR:=$(INSTALL_BASED','IR)/doc/$(PACKAGE_NAME)'#010+ ++ 'ifdef INS','TALL_FPCPACKAGE'#010+ ++ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+ + 'else'#010+ + 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ + 'endif'#010+ +@@ -736,9 +740,9 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '# Where to install the examples, under linux we use the doc dir'#010+ +- '# because the copytree command will create a subdir itself'#010+ ++ '# because the copytree command will create',' a subdir itself'#010+ + 'ifndef INSTALL_EXAMPLEDIR'#010+ +- 'ifde','f UNIXHier'#010+ ++ 'ifdef UNIXHier'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ + #010+ + 'ifdef BSDhier'#010+ +@@ -746,10 +750,10 @@ const fpcmakeini : array[0..216,1..240] + ')/$(PACKAGE_NAME)'#010+ + 'else'#010+ + 'ifdef linuxHier'#010+ +- 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ ++ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOC','DIR)/examples'#010+ + 'else'#010+ +- 'INSTALL_EXAMPLEDIR:=$(INSTAL','L_PREFIX)/doc/fpc-$(FPC_VERSION)/example'+ +- 's/$(PACKAGE_NAME)'#010+ ++ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+ ++ '$(PACKAGE_NAME)'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ +@@ -759,9 +763,9 @@ const fpcmakeini : array[0..216,1..240] + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)-$'+ + '(PACKAGE_VERSION)'#010+ + 'else'#010+ +- 'ifdef linuxHier'#010+ +- 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/ex','amples/$(PACKAGE_NAME)-$(PAC'+ +- 'KAGE_VERSION)'#010+ ++ 'ifdef lin','uxHier'#010+ ++ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PACKA'+ ++ 'GE_VERSION)'#010+ + 'else'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ + 'RSION)'#010+ +@@ -771,8 +775,8 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'else'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ +- 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ +- 'els','e'#010+ ++ 'INSTALL_EXAMPLEDIR:=','$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ ++ 'else'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ + 'endif'#010+ + 'endif'#010+ +@@ -783,21 +787,21 @@ const fpcmakeini : array[0..216,1..240] + 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ + 'endif'#010+ + #010+ +- 'ifndef INSTALL_SHAREDDIR'#010+ +- 'INSTALL_SHAREDDIR=$(INSTALL_PRE','FIX)/lib'#010+ ++ 'ifndef IN','STALL_SHAREDDIR'#010+ ++ 'INSTALL_SHAREDDIR=$(INSTALL_PREFIX)/lib'#010+ + 'endif'#010+ + #010+ + '#####################################################################'#010+ + '# Cross compile dirs'#010+ + '#####################################################################'#010+ + #010+ +- 'ifdef CROSSCOMPILE'#010+ +- '# Directory where the cross compile tools a','re stored.'#010+ ++ 'ifdef CROSSCOMP','ILE'#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 CROSSBINDIR'#010+ +- 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ +- 'ifeq ($(CROSSBINDIR),)'#010, ++ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDI','R)/bin/$(SOURCESUFFIX))'#010+ ++ 'ifeq ($(CROSSBINDIR),)'#010+ + 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ + '(FULL_SOURCE))'#010+ + 'endif'#010+ +@@ -809,20 +813,20 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '[dirlibc]'#010+ + '# On linux, try to find where libgcc.a is.'#010+ +- 'ifeq ($(OS_SOURCE),linux)'#010+ ++ 'ifeq ($(OS_SOURCE','),linux)'#010+ + #010+ + '# Amd64 to i386?'#010+ + 'ifndef GCCLIBDIR'#010+ +- 'ife','q ($(CPU_TARGET),i386)'#010+ ++ 'ifeq ($(CPU_TARGET),i386)'#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 ($(CPU_TAR','GET),powerpc64)'#010+ + 'ifeq ($(BINUTILSPREFIX),)'#010+ +- 'GCCLI','BDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#010+ ++ 'GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ +@@ -830,21 +834,21 @@ const fpcmakeini : array[0..216,1..240] + '# Try cross gcc'#010+ + 'ifndef GCCLIBDIR'#010+ + 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+ +- 'XT),$(SEARCHPATH))))'#010+ ++ 'XT),$(SEARCHP','ATH))))'#010+ + 'ifneq ($(CROSSGCC),)'#010+ +- 'GCCLIBDIR:=$(shell',' dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ ++ 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ + '# Other libraries from ld.so.conf'#010+ + 'ifndef OTHERLIBDIR'#010+ + 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ +- '"; print $1 }'#039')'#010+ ++ '"; print $1 }',#039')'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ + 'ifdef inUnix'#010+ +- 'ifeq ($(OS_SOURCE)',',netbsd)'#010+ ++ 'ifeq ($(OS_SOURCE),netbsd)'#010+ + 'OTHERLIBDIR+=/usr/pkg/lib'#010+ + 'endif'#010+ + 'export GCCLIBDIR OTHERLIB'#010+ +@@ -854,7 +858,7 @@ const fpcmakeini : array[0..216,1..240] + '[extensions]'#010+ + '#####################################################################'#010+ + '# Default extensions'#010+ +- '#############################################################','#######'+ ++ '##############','######################################################'+ + '#'#010+ + #010+ + '# Default needed extensions (Go32v2,Linux)'#010+ +@@ -868,9 +872,9 @@ const fpcmakeini : array[0..216,1..240] + 'SMARTEXT=.sl'#010+ + 'STATICLIBEXT=.a'#010+ + 'SHAREDLIBEXT=.so'#010+ +- 'SHAREDLIBPREFIX=libfp'#010+ ++ 'SHAREDLIBPRE','FIX=libfp'#010+ + 'STATICLIBPREFIX=libp'#010+ +- 'IMPORTLIBPREFIX=','libimp'#010+ ++ 'IMPORTLIBPREFIX=libimp'#010+ + 'RSTEXT=.rst'#010+ + '# external debug info for executable'#010+ + 'EXEDBGEXT=.dbg'#010+ +@@ -879,12 +883,12 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '# Go32v1'#010+ + 'ifeq ($(OS_TARGET),go32v1)'#010+ +- 'STATICLIBPREFIX='#010+ ++ 'STATI','CLIBPREFIX='#010+ + 'SHORTSUFFIX=v1'#010+ + 'endif'#010+ + #010+ + '# Go32v2'#010+ +- 'ifeq',' ($(OS_TARGET),go32v2)'#010+ ++ 'ifeq ($(OS_TARGET),go32v2)'#010+ + 'STATICLIBPREFIX='#010+ + 'SHORTSUFFIX=dos'#010+ + 'IMPORTLIBPREFIX='#010+ +@@ -897,11 +901,11 @@ const fpcmakeini : array[0..216,1..240] + 'ASMEXT=.asm'#010+ + 'SHAREDLIBEXT=.dll'#010+ + 'SHORTSUFFIX=wat'#010+ +- 'IMPORTLIBPREFIX='#010+ ++ 'IMPO','RTLIBPREFIX='#010+ + 'endif'#010+ + #010+ + '# Linux'#010+ +- 'ifeq ($(OS_TARGET),','linux)'#010+ ++ 'ifeq ($(OS_TARGET),linux)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'HASSHAREDLIB=1'#010+ +@@ -917,11 +921,11 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '# NetBSD'#010+ +- 'ifeq ($(OS_TARGET),netbsd)'#010+ ++ 'ifeq ($(OS_TARGET),ne','tbsd)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'HASSHAREDLIB=1'#010+ +- 'SHORT','SUFFIX=nbs'#010+ ++ 'SHORTSUFFIX=nbs'#010+ + 'endif'#010+ + #010+ + '# OpenBSD'#010+ +@@ -938,10 +942,10 @@ const fpcmakeini : array[0..216,1..240] + 'SHORTSUFFIX=w32'#010+ + 'endif'#010+ + #010+ +- '# OS/2'#010+ ++ '# O','S/2'#010+ + 'ifeq ($(OS_TARGET),os2)'#010+ + 'BATCHEXT=.cmd'#010+ +- 'AOUTE','XT=.out'#010+ ++ 'AOUTEXT=.out'#010+ + 'STATICLIBPREFIX='#010+ + 'SHAREDLIBEXT=.dll'#010+ + 'SHORTSUFFIX=os2'#010+ +@@ -955,12 +959,12 @@ const fpcmakeini : array[0..216,1..240] + 'AOUTEXT=.out'#010+ + 'STATICLIBPREFIX='#010+ + 'SHAREDLIBEXT=.dll'#010+ +- 'SHORTSUFFIX=emx'#010+ ++ 'SHORTSUF','FIX=emx'#010+ + 'ECHO=echo'#010+ + 'IMPORTLIBPREFIX='#010+ + 'endif'#010+ + #010+ +- '# Ami','ga'#010+ ++ '# Amiga'#010+ + 'ifeq ($(OS_TARGET),amiga)'#010+ + 'EXEEXT='#010+ + 'SHAREDLIBEXT=.library'#010+ +@@ -975,10 +979,10 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '# Atari'#010+ +- 'ifeq ($(OS_TARGET),atari)'#010+ ++ 'ifeq ($(OS_T','ARGET),atari)'#010+ + 'EXEEXT=.ttp'#010+ + 'SHORTSUFFIX=ata'#010+ +- 'endif',#010+ ++ 'endif'#010+ + #010+ + '# BeOS'#010+ + 'ifeq ($(OS_TARGET),beos)'#010+ +@@ -995,13 +999,14 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '# Solaris'#010+ +- 'ifeq ($(OS_TARGET),solaris)'#010+ ++ 'ifeq ($(OS_TARGET),solaris)'#010, + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ ++ 'HASSHAREDLIB=1'#010+ + 'SHORTSUFFIX=sun'#010+ + 'endif'#010+ + #010+ +- '# Q','NX'#010+ ++ '# QNX'#010+ + 'ifeq ($(OS_TARGET),qnx)'#010+ + 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ +@@ -1013,12 +1018,12 @@ const fpcmakeini : array[0..216,1..240] + 'EXEEXT=.nlm'#010+ + 'STATICLIBPREFIX='#010+ + 'SHORTSUFFIX=nw'#010+ +- 'IMPORTLIBPREFIX=imp'#010+ ++ 'IMPORTLIBPREFIX=imp'#010, + 'endif'#010+ + #010+ + '# Netware libc'#010+ + 'ifeq ($(OS_TARGET),netwlibc)'#010+ +- 'EXEEXT=.nlm',#010+ ++ 'EXEEXT=.nlm'#010+ + 'STATICLIBPREFIX='#010+ + 'SHORTSUFFIX=nwl'#010+ + 'IMPORTLIBPREFIX=imp'#010+ +@@ -1033,9 +1038,9 @@ const fpcmakeini : array[0..216,1..240] + 'IMPORTLIBPREFIX=imp'#010+ + 'endif'#010+ + #010+ +- '# Darwin'#010+ ++ '# D','arwin'#010+ + 'ifneq ($(findstring $(OS_TARGET),darwin iphonesim),)'#010+ +- 'BAT','CHEXT=.sh'#010+ ++ 'BATCHEXT=.sh'#010+ + 'EXEEXT='#010+ + 'HASSHAREDLIB=1'#010+ + 'SHORTSUFFIX=dwn'#010+ +@@ -1050,11 +1055,11 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '# Symbian OS'#010+ +- 'ifeq ($(OS_TARGET),symbian)'#010+ ++ 'ifeq ($(OS_','TARGET),symbian)'#010+ + 'SHAREDLIBEXT=.dll'#010+ + 'SHORTSUFFIX=symbian'#010+ + 'endif'#010+ +- #010, ++ #010+ + '# NativeNT'#010+ + 'ifeq ($(OS_TARGET),NativeNT)'#010+ + 'SHAREDLIBEXT=.dll'#010+ +@@ -1068,18 +1073,18 @@ const fpcmakeini : array[0..216,1..240] + 'SHORTSUFFIX=wii'#010+ + 'endif'#010+ + #010+ +- '# For 8.3 limited OS'#039's the short suffixes'#010+ +- '# Otherwise use the full sourc','e/target names'#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+ + 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ + 'ZIPCROSSPREFIX='#010+ + 'ZIPSOURCESUFFIX=src'#010+ + 'ZIPEXAMPLESUFFIX=exm'#010+ +- 'else'#010+ ++ 'e','lse'#010+ + 'FPCMADE=fpcmade.$(TARGETSUFFIX)'#010+ + 'ZIPSOURCESUFFIX=.source'#010+ +- 'ZI','PEXAMPLESUFFIX=.examples'#010+ ++ 'ZIPEXAMPLESUFFIX=.examples'#010+ + 'ifdef CROSSCOMPILE'#010+ + 'ZIPSUFFIX=.$(SOURCESUFFIX)'#010+ + 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ +@@ -1089,19 +1094,18 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'endif'#010+ + #010+ +- '[defaulttools]'#010+ +- '#############################################################','#######'+ +- '#'#010+ ++ '[defaulttools]',#010+ ++ '#####################################################################'#010+ + '# Default Tools'#010+ + '#####################################################################'#010+ + #010+ + '# Names of the binutils tools'#010+ + 'ASNAME=$(BINUTILSPREFIX)as'#010+ +- 'LDNAME=$(BINUTILSPREFIX)ld'#010+ ++ 'LDNAME=$(BINUTILSPREFIX)l','d'#010+ + 'ARNAME=$(BINUTILSPREFIX)ar'#010+ + 'RCNAME=$(BINUTILSPREFIX)rc'#010+ + #010+ +- '# ass','embler, redefine it if cross compiling'#010+ ++ '# assembler, redefine it if cross compiling'#010+ + 'ifndef ASPROG'#010+ + 'ifdef CROSSBINDIR'#010+ + 'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+ +@@ -1110,10 +1114,10 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'endif'#010+ + #010+ +- '# linker, but probably not used'#010+ ++ '# linker, but probably not u','sed'#010+ + 'ifndef LDPROG'#010+ + 'ifdef CROSSBINDIR'#010+ +- 'LDPROG=$(CROSSBINDIR)/$(LD','NAME)$(SRCEXEEXT)'#010+ ++ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ + 'else'#010+ + 'LDPROG=$(LDNAME)'#010+ + 'endif'#010+ +@@ -1126,12 +1130,12 @@ const fpcmakeini : array[0..216,1..240] + 'else'#010+ + 'RCPROG=$(RCNAME)'#010+ + 'endif'#010+ +- 'endif'#010+ ++ 'e','ndif'#010+ + #010+ + '# Archiver'#010+ + 'ifndef ARPROG'#010+ + 'ifdef CROSSBINDIR'#010+ +- 'ARPROG=$(CROS','SBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ ++ 'ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ + 'else'#010+ + 'ARPROG=$(ARNAME)'#010+ + 'endif'#010+ +@@ -1144,11 +1148,11 @@ const fpcmakeini : array[0..216,1..240] + 'AR=$(ARPROG)'#010+ + #010+ + '# ppas.bat / ppas.sh'#010+ +- 'PPAS=ppas$(SRCBATCHEXT)'#010+ ++ 'PPAS=ppas$(SRCBATC','HEXT)'#010+ + #010+ + '# ldconfig to rebuild .so cache'#010+ + 'ifdef inUnix'#010+ +- 'LDCONFIG=l','dconfig'#010+ ++ 'LDCONFIG=ldconfig'#010+ + 'else'#010+ + 'LDCONFIG='#010+ + 'endif'#010+ +@@ -1165,7 +1169,7 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '# Tar options'#010+ + 'ifeq ($(USETAR),bz2)'#010+ +- 'TAROPT=vj'#010+ ++ 'TAROPT=vj'#010, + 'TAREXT=.tar.bz2'#010+ + 'else'#010+ + 'TAROPT=vz'#010+ +@@ -1173,12 +1177,12 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + #010+ +- '[command','_begin]'#010+ ++ '[command_begin]'#010+ + '#####################################################################'#010+ + '# Compiler Command Line'#010+ + '#####################################################################'#010+ + #010+ +- '# Load commandline OPTDEF and add FPC_CPU define, for compiling the',#010+ ++ '# Loa','d commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ + '# compiler this needs to be turned off'#010+ + 'ifndef NOCPUDEF'#010+ + 'override FPCOPTDEF=$(ARCH)'#010+ +@@ -1186,11 +1190,11 @@ const fpcmakeini : array[0..216,1..240] + #010+ + #010+ + '# Load commandline OPT and add target and unit dir to be sure'#010+ +- 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ ++ 'ifneq ($(OS_TARGET),$(OS_','SOURCE))'#010+ + 'override FPCOPT+=-T$(OS_TARGET)'#010+ + 'endif'#010+ + #010+ +- 'ifneq ($(CPU_T','ARGET),$(CPU_SOURCE))'#010+ ++ 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ + 'override FPCOPT+=-P$(ARCH)'#010+ + 'endif'#010+ + #010+ +@@ -1199,9 +1203,9 @@ const fpcmakeini : array[0..216,1..240] + 'override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ + 'endif'#010+ + #010+ +- 'ifndef CROSSBOOTSTRAP'#010+ ++ 'i','fndef CROSSBOOTSTRAP'#010+ + 'ifneq ($(BINUTILSPREFIX),)'#010+ +- 'override FPCOP','T+=-XP$(BINUTILSPREFIX)'#010+ ++ 'override FPCOPT+=-XP$(BINUTILSPREFIX)'#010+ + 'endif'#010+ + 'ifneq ($(BINUTILSPREFIX),)'#010+ + 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ +@@ -1210,7 +1214,7 @@ const fpcmakeini : array[0..216,1..240] + #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-f','re'+ ++ '# it',' while compiling the fpmake file. (For example to build i386-fre'+ + 'ebsd'#010+ + '# with BINUTILSPREFIX=i386-)'#010+ + 'ifndef CROSSCOMPILE'#010+ +@@ -1219,9 +1223,9 @@ const fpcmakeini : array[0..216,1..240] + '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 -F','u,$(UNITDIR))'#010+ ++ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ + 'endif'#010+ + 'ifdef LIBDIR'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ +@@ -1230,11 +1234,11 @@ const fpcmakeini : array[0..216,1..240] + '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+ + '# Smartlinking'#010+ +- 'ifdef LINKSMART',#010+ ++ 'ifdef LINKSMART'#010+ + 'override FPCOPT+=-XX'#010+ + 'endif'#010+ + #010+ +@@ -1249,9 +1253,9 @@ const fpcmakeini : array[0..216,1..240] + 'override FPCOPTDEF+=DEBUG'#010+ + 'endif'#010+ + #010+ +- '# Release mode'#010+ ++ '# Rel','ease mode'#010+ + '# (strip, optimize and don'#039't load fpc.cfg)'#010+ +- '# fpc 2.1',' has -O2 for all targets'#010+ ++ '# fpc 2.1 has -O2 for all targets'#010+ + 'ifdef RELEASE'#010+ + 'ifneq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ + 'ifeq ($(CPU_TARGET),i386)'#010+ +@@ -1259,11 +1263,11 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'ifeq ($(CPU_TARGET),powerpc)'#010+ + 'FPCCPUOPT:=-O1r'#010+ +- 'endif'#010+ ++ 'e','ndif'#010+ + 'else'#010+ + 'FPCCPUOPT:=-O2'#010+ + 'endif'#010+ +- 'override FPCOPT+=-Ur -Xs $(FPCC','PUOPT) -n'#010+ ++ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ + 'override FPCOPTDEF+=RELEASE'#010+ + 'endif'#010+ + #010+ +@@ -1277,61 +1281,61 @@ const fpcmakeini : array[0..216,1..240] + 'override FPCOPT+=-O2'#010+ + 'endif'#010+ + #010+ +- '# Verbose settings (warning,note,info)'#010+ ++ '# Verbose settings (warning,no','te,info)'#010+ + 'ifdef VERBOSE'#010+ + 'override FPCOPT+=-vwni'#010+ + 'endif'#010+ + #010+ +- '# Needed ','compiler options'#010+ ++ '# Needed compiler options'#010+ + 'ifdef COMPILER_OPTIONS'#010+ + 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ + 'endif'#010+ + 'ifdef COMPILER_UNITDIR'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ + 'endif'#010+ +- 'ifdef COMPILER_LIBRARYDIR'#010+ +- 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBR','ARYDIR))'#010+ ++ 'ifdef COMPIL','ER_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,$(COMPILER_INCLUDEDIR))'#010+ ++ 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUD','EDIR))'#010+ + 'endif'#010+ + #010+ + '# Cross compiler utils'#010+ + 'ifdef CROSSBINDIR'#010+ +- 'overrid','e FPCOPT+=-FD$(CROSSBINDIR)'#010+ ++ 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ + 'endif'#010+ + #010+ + '# Target dirs and the prefix to use for clean/install'#010+ + 'ifdef COMPILER_TARGETDIR'#010+ + 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ +- 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ ++ 'ifeq ($(COMPILER_TARGE','TDIR),.)'#010+ + 'override TARGETDIRPREFIX='#010+ + 'else'#010+ +- 'override TARGETDIRPREF','IX=$(COMPILER_TARGETDIR)/'#010+ ++ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ + '# Unit target dir (default is units/<cpu>-<os>/'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ + 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ +- 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ ++ 'ifeq ($(COMPILER','_UNITTARGETDIR),.)'#010+ + 'override UNITTARGETDIRPREFIX='#010+ + 'else'#010+ +- 'override',' UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#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 UNITTARGETDIRPREFIX=$(TARGETDIR','PREFIX)'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ + 'ifdef CREATESHARED'#010+ + 'override FPCOPT+=-Cg'#010+ +- #010, ++ #010+ + 'ifeq ($(CPU_TARGET),i386)'#010+ + 'override FPCOPT+=-Aas'#010+ + 'endif'#010+ +@@ -1340,9 +1344,9 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '# create always pic'#039'ed code on x86_64'#010+ + 'ifeq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ +- 'ifneq ($(findstring $(OS_TARGET),freebsd openbsd netbsd linux solaris)'+ +- ',)'#010+ +- 'ifeq ($(CPU_TARGET),x86_6','4)'#010+ ++ 'ifneq ($(findstring $(OS_TARGET),fre','ebsd openbsd netbsd linux solari'+ ++ 's),)'#010+ ++ 'ifeq ($(CPU_TARGET),x86_64)'#010+ + 'override FPCOPT+=-Cg'#010+ + 'endif'#010+ + 'endif'#010+ +@@ -1356,10 +1360,10 @@ const fpcmakeini : array[0..216,1..240] + '[command_libc]'#010+ + '# Add GCC lib path if asked'#010+ + 'ifdef GCCLIBDIR'#010+ +- 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ ++ 'ove','rride FPCOPT+=-Fl$(GCCLIBDIR)'#010+ + 'endif'#010+ + 'ifdef OTHERLIBDIR'#010+ +- 'override',' FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ ++ 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ + 'endif'#010+ + #010+ + #010+ +@@ -1369,9 +1373,9 @@ const fpcmakeini : array[0..216,1..240] + 'override FPCOPT+=$(OPT)'#010+ + 'endif'#010+ + #010+ +- '# Add defines from FPCOPTDEF to FPCOPT'#010+ ++ '# Add defines from FPC','OPTDEF 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+ +@@ -1381,9 +1385,9 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '# Use the environment to pass commandline options?'#010+ + 'ifdef USEENV'#010+ +- 'override FPCEXTCMD:=$(FPCOPT)'#010+ ++ 'override',' FPCEXTCMD:=$(FPCOPT)'#010+ + 'override FPCOPT:=!FPCEXTCMD'#010+ +- 'export FPCEX','TCMD'#010+ ++ 'export FPCEXTCMD'#010+ + 'endif'#010+ + #010+ + 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ +@@ -1391,21 +1395,21 @@ const fpcmakeini : array[0..216,1..240] + #010+ + 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ + 'override ACROSSCOMPILE=1'#010+ +- 'endif'#010+ ++ 'en','dif'#010+ + #010+ + 'ifdef ACROSSCOMPILE'#010+ + 'override FPCOPT+=$(CROSSOPT)'#010+ + 'endif'#010+ + #010+ +- '#',' Compiler commandline'#010+ ++ '# Compiler commandline'#010+ + 'override COMPILER:=$(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+ +- 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ ++ 'ifeq (,$(findstring ','-s ,$(COMPILER)))'#010+ + 'EXECPPAS='#010+ + 'else'#010+ +- 'ifeq ($(FULL_SOURCE),$(FULL_T','ARGET))'#010+ ++ 'ifeq ($(FULL_SOURCE),$(FULL_TARGET))'#010+ + 'ifdef RUNBATCH'#010+ + 'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+ + 'else'#010+ +@@ -1416,19 +1420,19 @@ const fpcmakeini : array[0..216,1..240] + #010+ + #010+ + '[loaderrules]'#010+ +- '#####################################################################'#010+ +- '# Loaders'#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 INSTALLTARGET+=fpc_loaders_install'#010+ ++ 'override INSTALLTARGET+=fpc_loaders','_install'#010+ + #010+ +- 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_','LOADERS))'#010+ ++ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'endif'#010+ + #010+ + '%$(OEXT): %$(LOADEREXT)'#010+ +@@ -1438,9 +1442,9 @@ const fpcmakeini : array[0..216,1..240] + ' $(AS) -o $*$(OEXT) $<'#010+ + 'endif'#010+ + #010+ +- 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ ++ 'fpc_loader','s: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ + #010+ +- 'fpc_loaders_clea','n:'#010+ ++ 'fpc_loaders_clean:'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ + ' -$(DEL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFILES)'+ + ')'#010+ +@@ -1449,18 +1453,19 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + 'fpc_loaders_install:'#010+ +- ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ++ ' $','(MKDIR) $(INSTALL_UNITDIR)'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ +- ' ',' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROF'+ +- 'ILES)) $(INSTALL_UNITDIR)'#010+ ++ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ ++ 'ES)) $(INSTALL_UNITDIR)'#010+ + 'else'#010+ + ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ + 'endif'#010+ + #010+ + #010+ + '[unitrules]'#010+ +- '#####################################################################'#010+ +- '# U','nits'#010+ ++ '###########','#########################################################'+ ++ '#'#010+ ++ '# Units'#010+ + '#####################################################################'#010+ + #010+ + '.PHONY: fpc_units'#010+ +@@ -1468,42 +1473,43 @@ const fpcmakeini : array[0..216,1..240] + 'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+ + 'override ALLTARGET+=fpc_units'#010+ + #010+ +- 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ +- 'overr','ide IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+ +- 'TUNITS))'#010+ ++ 'over','ride UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ ++ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ ++ 'NITS))'#010+ + 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ +- 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ ++ 'override CLEANPPUFILES+=$(UNITPPUFILES) ','$(IMPLICITUNITPPUFILES)'#010+ + 'endif'#010+ + #010+ +- 'fpc_units: $(COMPILER_UNITTARGE','TDIR) $(UNITPPUFILES)'#010+ ++ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ + #010+ + #010+ + '[exerules]'#010+ + '#####################################################################'#010+ + '# Exes'#010+ +- '#####################################################################'#010+ ++ '##################################################################','##'+ ++ '#'#010+ + #010+ + '.PHONY: fpc_exes'#010+ + #010+ +- '# Programs are not needed for a cross i','nstallation'#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))'+ ++ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)',') $(addpre'+ ++ 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ + ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ + 'PROGRAMS)))'#010+ + 'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+ + #010+ +- 'override ALLTARGET+=fpc_exes'#010+ ++ 'override A','LLTARGET+=fpc_exes'#010+ + 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ +- 'overr','ide CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ ++ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+ + 'ifeq ($(OS_TARGET),os2)'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ +- 'endif'#010+ ++ 'e','ndif'#010+ + 'ifeq ($(OS_TARGET),emx)'#010+ +- 'override CLEANEXEFILES+=$(addsuff','ix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ ++ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ +@@ -1512,10 +1518,10 @@ const fpcmakeini : array[0..216,1..240] + #010+ + #010+ + '[rstrules]'#010+ +- '#####################################################################'#010+ +- '# Resource strings'#010+ +- '###############','#####################################################'+ ++ '##########################################','##########################'+ + '#'#010+ ++ '# Resource strings'#010+ ++ '#####################################################################'#010+ + #010+ + 'ifdef TARGET_RSTS'#010+ + 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ +@@ -1524,9 +1530,8 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + #010+ +- '[examplerules]'#010+ +- '##################################################','##################'+ +- '#'#010+ ++ '[ex','amplerules]'#010+ ++ '#####################################################################'#010+ + '# Examples'#010+ + '#####################################################################'#010+ + #010+ +@@ -1534,44 +1539,43 @@ const fpcmakeini : array[0..216,1..240] + #010+ + 'ifneq ($(TARGET_EXAMPLES),)'#010+ + 'HASEXAMPLES=1'#010+ +- 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ +- 'LES)',') $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ ++ 'override EXA','MPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXA'+ ++ 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ + '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ +- 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ +- 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES',')) $(ad'+ +- 'dprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ +- 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ +- 'GET_EXAMPLES)))'#010+ +- 'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(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),$(addsuffix $(STATICLIBEXT),$(TARGE'+ ++ 'T_EXAMPLES)))'#010+ ++ 'override EXAMPL','EDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES'+ ++ '))'#010+ + #010+ +- 'overr','ide CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ ++ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ + 'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+ + 'ifeq ($(OS_TARGET),os2)'#010+ +- 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ ++ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_','EXAMPLES))'#010+ + 'endif'#010+ + 'ifeq ($(OS_TARGET),emx)'#010+ +- 'override CLEANEXEFILE','S+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ ++ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'endif'#010+ + 'endif'#010+ + 'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+ + 'HASEXAMPLES=1'#010+ + 'endif'#010+ + #010+ +- 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+ +- 'S))'#010+ ++ 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED','I'+ ++ 'RS))'#010+ + #010+ + #010+ + '[compilerules]'#010+ +- '#######################################','#############################'+ +- '#'#010+ ++ '#####################################################################'#010+ + '# General compile rules'#010+ + '#####################################################################'#010+ + #010+ +- '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+ ++ '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_','shared'#010+ + #010+ + '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ +- ' @$','(ECHOREDIR) Compiled > $(FPCMADE)'#010+ ++ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ + #010+ + 'fpc_all: $(FPCMADE)'#010+ + #010+ +@@ -1582,18 +1586,18 @@ const fpcmakeini : array[0..216,1..240] + ' $(MAKE) all DEBUG=1'#010+ + #010+ + 'fpc_release:'#010+ +- ' $(MAKE) all RELEASE=1'#010+ ++ ' $(M','AKE) all RELEASE=1'#010+ + #010+ +- '# General compile rules, available for bot','h possible .pp and .pas ex'+ +- 'tensions'#010+ ++ '# 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+ + #010+ + '$(COMPILER_UNITTARGETDIR):'#010+ +- ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ ++ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010, + #010+ + '$(COMPILER_TARGETDIR):'#010+ +- ' $(MKDIRTREE) $(COMPILER_TARGET','DIR)'#010+ ++ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ + #010+ + '%$(PPUEXT): %.pp'#010+ + ' $(COMPILER) $<'#010+ +@@ -1605,11 +1609,11 @@ const fpcmakeini : array[0..216,1..240] + #010+ + '%$(EXEEXT): %.pp'#010+ + ' $(COMPILER) $<'#010+ +- ' $(EXECPPAS)'#010+ ++ ' $','(EXECPPAS)'#010+ + #010+ + '%$(EXEEXT): %.pas'#010+ + ' $(COMPILER) $<'#010+ +- ' $','(EXECPPAS)'#010+ ++ ' $(EXECPPAS)'#010+ + #010+ + '%$(EXEEXT): %.lpr'#010+ + ' $(COMPILER) $<'#010+ +@@ -1622,20 +1626,19 @@ const fpcmakeini : array[0..216,1..240] + '%.res: %.rc'#010+ + ' windres -i $< -o $@'#010+ + #010+ +- '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ +- 'vpath %.pp $(COM','PILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#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_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ +- 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ +- 'vpath %.inc $(COMPILER_INCLUD','EDIR)'#010+ ++ 'vpath %.dpr $(COMPILER_S','OURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ ++ 'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+ + 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ + 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ + #010+ + '[sharedrules]'#010+ + '#####################################################################'#010+ +- '# Library'#010+ +- '#######################################################','#############'+ +- '#'#010+ ++ '# L','ibrary'#010+ ++ '#####################################################################'#010+ + #010+ + '.PHONY: fpc_shared'#010+ + #010+ +@@ -1646,26 +1649,26 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + 'ifndef SHARED_LIBNAME'#010+ +- 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ ++ 'SHARED_LIBN','AME=$(PACKAGE_NAME)'#010+ + 'endif'#010+ + #010+ + 'ifndef SHARED_FULLNAME'#010+ +- 'SHARED_FULLN','AME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERS'+ +- 'ION)$(SHAREDLIBEXT)'#010+ ++ 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ ++ 'N)$(SHAREDLIBEXT)'#010+ + 'endif'#010+ + #010+ + '# Default sharedlib units are all unit objects'#010+ + 'ifndef SHARED_LIBUNITS'#010+ +- 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ +- 'override SHARED_LIBUNITS:=$(fi','lter-out $(INSTALL_BUILDUNIT),$(SHARED'+ +- '_LIBUNITS))'#010+ ++ 'SHARED_LIBUNITS:=$(TARGET','_UNITS) $(TARGET_IMPLICITUNITS)'#010+ ++ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ ++ 'IBUNITS))'#010+ + 'endif'#010+ + #010+ + 'fpc_shared:'#010+ + 'ifdef HASSHAREDLIB'#010+ + ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ + 'ifneq ($(SHARED_BUILD),n)'#010+ +- ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGET','DIR)'+ ++ ' ',' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+ + ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ + 'endif'#010+ + 'else'#010+ +@@ -1674,8 +1677,8 @@ const fpcmakeini : array[0..216,1..240] + #010+ + 'fpc_shared_install:'#010+ + 'ifneq ($(SHARED_BUILD),n)'#010+ +- 'ifneq ($(SHARED_LIBUNITS),)'#010+ +- 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(','SHARED_FULLNAME)),)'#010+ ++ 'ifneq ($(SHA','RED_LIBUNITS),)'#010+ ++ 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ + ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ + 'ALL_SHAREDDIR)'#010+ + 'endif'#010+ +@@ -1683,39 +1686,39 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '[installrules]'#010+ +- '#####################################################################'#010+ +- '# Install rules'#010+ +- '###############','#####################################################'+ ++ '#######################################','#############################'+ + '#'#010+ ++ '# Install rules'#010+ ++ '#####################################################################'#010+ + #010+ + '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ + #010+ + 'ifdef INSTALL_UNITS'#010+ +- 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ ++ 'override INSTALLPPUFILES+=$(addsuffix $(PPUE','XT),$(INSTALL_UNITS))'#010+ + 'endif'#010+ + #010+ + 'ifdef INSTALL_BUILDUNIT'#010+ +- 'override ','INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT)'+ +- ',$(INSTALLPPUFILES))'#010+ ++ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ ++ '(INSTALLPPUFILES))'#010+ + 'endif'#010+ + #010+ + 'ifdef INSTALLPPUFILES'#010+ +- 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ +- 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STAT','ICLIBEX'+ +- 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ +- 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ ++ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUF', ++ 'ILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT'+ ++ '),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT'+ ++ '),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ + 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ +- 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ +- '$(INSTALLPPUFILES)))'#010, ++ 'override INSTALLPPUFILES:=$(a','ddprefix $(UNITTARGETDIRPREFIX),$(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+ ++ 'override INSTALL_CREATEPACKA','GEFPC=1'#010+ + 'endif'#010+ + #010+ + 'ifdef INSTALLEXEFILES'#010+ +- 'ifneq ($(TARGETDIRPREFIX)',',)'#010+ ++ 'ifneq ($(TARGETDIRPREFIX),)'#010+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ + 'STALLEXEFILES)))'#010+ + 'endif'#010+ +@@ -1723,86 +1726,86 @@ const fpcmakeini : array[0..216,1..240] + #010+ + 'fpc_install: all $(INSTALLTARGET)'#010+ + 'ifdef INSTALLEXEFILES'#010+ +- ' $(MKDIR) $(INSTALL_BINDIR)'#010+ +- ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INS','TALL_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+ ++ '# a safety check is done if Makefile.fpc ','is available'#010+ + 'ifdef PACKAGE_VERSION'#010+ +- 'ifneq ($(wildcard Makefile.','fpc),)'#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+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ +- 'endif'#010+ ++ 'end','if'#010+ + 'ifdef INSTALLPPUFILES'#010+ + ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ +- ' ',' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ ++ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ + 'ifneq ($(INSTALLPPULINKFILES),)'#010+ + ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ + 'endif'#010+ +- 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ++ 'ifneq ($(wildcard $(LIB','_FULLNAME)),)'#010+ + ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ +- ' $(INS','TALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ ++ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ + 'ifdef inUnix'#010+ + ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ + 'ifdef INSTALL_FILES'#010+ +- ' $(MKDIR) $(INSTALL_DATADIR)'#010+ +- ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADI','R)'#010+ ++ ' $(MKDIR) $(INSTALL','_DATADIR)'#010+ ++ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ + 'endif'#010+ + #010+ + 'fpc_sourceinstall: distclean'#010+ + ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ + ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ + #010+ +- 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ ++ 'fpc_exampleinstall: $(addsuffix _distclean,$(T','ARGET_EXAMPLEDIRS))'#010+ + 'ifdef HASEXAMPLES'#010+ +- ' $(MKDIR) $(INSTA','LL_EXAMPLEDIR)'#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'+ +- 'AMPLEDIR)'#010+ ++ ' $(COPYTREE) $(addsuffix /*,$(TARG','ET_EXAMPLEDIRS)) $(INSTALL_'+ ++ 'EXAMPLEDIR)'#010+ + 'endif'#010+ + #010+ +- '[distinstallrule','s]'#010+ ++ '[distinstallrules]'#010+ + '#####################################################################'#010+ + '# Dist Install'#010+ + '#####################################################################'#010+ + #010+ +- '.PHONY: fpc_distinstall'#010+ ++ '.PHONY: fpc_distins','tall'#010+ + #010+ + 'fpc_distinstall: install exampleinstall'#010+ + #010+ + #010+ +- '[zipinstallrul','es]'#010+ ++ '[zipinstallrules]'#010+ + '#####################################################################'#010+ + '# Zip'#010+ + '#####################################################################'#010+ + #010+ +- '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ ++ '.PHONY: fpc_zipinstall fpc_','zipsourceinstall fpc_zipexampleinstall'#010+ + #010+ +- '# Temporary path to pa','ck a file, can only use a single deep'#010+ ++ '# Temporary path to pack a file, can only use a single deep'#010+ + '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ + 'ifndef PACKDIR'#010+ + 'ifndef inUnix'#010+ + 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ + 'else'#010+ +- 'PACKDIR=/tmp/fpc-pack'#010+ ++ 'PACKDIR=/t','mp/fpc-pack'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ +- '# Maybe create default zipname from p','ackagename'#010+ ++ '# Maybe create default zipname from packagename'#010+ + 'ifndef ZIPNAME'#010+ + 'ifdef DIST_ZIPNAME'#010+ + 'ZIPNAME=$(DIST_ZIPNAME)'#010+ +@@ -1812,12 +1815,12 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + 'ifndef FULLZIPNAME'#010+ +- 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ ++ 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNA','ME)$(ZIPSUFFIX)'#010+ + 'endif'#010+ + #010+ + '# ZipTarget'#010+ + 'ifndef ZIPTARGET'#010+ +- 'ifdef DIST','_ZIPTARGET'#010+ ++ 'ifdef DIST_ZIPTARGET'#010+ + 'ZIPTARGET=DIST_ZIPTARGET'#010+ + 'else'#010+ + 'ZIPTARGET=install'#010+ +@@ -1831,49 +1834,50 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'endif'#010+ + #010+ +- '# Use a wrapper script by default for Os/2'#010+ ++ '# Use a wrapper script b','y default for Os/2'#010+ + 'ifndef inUnix'#010+ + 'USEZIPWRAPPER=1'#010+ + 'endif'#010+ + #010+ +- '# We n','eed to be able to run in the current OS so fix'#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$(SRCBATCHEXT)',')'+ ++ #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+ ++ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TA','REXT)'#010+ + 'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+ +- 'else',#010+ ++ 'else'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ + 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ + 'TFILE) *'#010+ + 'endif'#010+ + #010+ + 'fpc_zipinstall:'#010+ +- ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ +- ' $(MKDIR)',' $(DIST_DESTDIR)'#010+ ++ ' $(MAKE) $(ZIPT','ARGET) 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))" > $(ZIPWRAPPE'+ +- 'R)'#010+ +- ' $(ECHOREDIR',') -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ +- 'R)'#010+ ++ ' $(ECHOREDIR) -e "$(sub','st \,\\,$(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) >> $(ZIPWRAPPER)'#010+ +- ' echo $(ZIPC','MD_CDBASE) >> $(ZIPWRAPPER)'#010+ ++ ' ',' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ++ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ + 'endif'#010+ + 'ifdef inUnix'#010+ + ' /bin/sh $(ZIPWRAPPER)'#010+ +@@ -1884,9 +1888,9 @@ const fpcmakeini : array[0..216,1..240] + ' $(ZIPWRAPPER)'#010+ + 'endif'#010+ + 'endif'#010+ +- ' $(DEL) $(ZIPWRAPPER)'#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+ +@@ -1894,10 +1898,10 @@ const fpcmakeini : array[0..216,1..240] + ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ + 'SOURCESUFFIX)'#010+ + #010+ +- 'fpc_zipexampleinstall:'#010+ ++ 'fpc_zipexa','mpleinstall:'#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+ +@@ -1905,25 +1909,25 @@ const fpcmakeini : array[0..216,1..240] + #010+ + #010+ + '[cleanrules]'#010+ +- '#####################################################################'#010+ +- '# Clean rules'#010+ +- '######','##############################################################'+ ++ '############################','########################################'+ + '#'#010+ ++ '# Clean rules'#010+ ++ '#####################################################################'#010+ + #010+ + '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ + #010+ + 'ifdef EXEFILES'#010+ +- 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ +- '))'#010+ +- 'override CLEANEXEDBGFILES:=$(addprefix $(','TARGETDIRPREFIX),$(CLEANEXE'+ +- 'DBGFILES))'#010+ ++ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFI','X),$(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 $(TARGETDIRPREFIX),$(addsuffix '+ +- '$(EXED','BGEXT), $(CLEAN_PROGRAMS)))'#010+ ++ 'override CLEAN','EXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffi'+ ++ 'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+ + 'endif'#010+ + #010+ + 'ifdef CLEAN_UNITS'#010+ +@@ -1931,50 +1935,50 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + 'ifdef CLEANPPUFILES'#010+ +- 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ +- ') $(addprefix $(STATICLIBPRE','FIX),$(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),$(DEBUGSYMEXT),$(CLEANPP'+ +- 'UFILES))'#010+ +- 'e','ndif'#010+ ++ 'override CLEANPPUL','INKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEAN'+ ++ 'PPUFILES))'#010+ ++ 'endif'#010+ + 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ + 'ILES))'#010+ + 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ +- 'IX),$(CLEANPPULINKFILES)))'#010+ ++ 'IX),$(CLEANPPULINKFILES)))',#010+ + 'endif'#010+ + #010+ + 'fpc_clean: $(CLEANTARGET)'#010+ + 'ifdef CLEANEXEFILES'#010+ +- ' ','-$(DEL) $(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+ ++ 'ifdef CLEAN','PPUFILES'#010+ + ' -$(DEL) $(CLEANPPUFILES)'#010+ + 'endif'#010+ +- 'ifneq ($(CLEAN','PPULINKFILES),)'#010+ ++ 'ifneq ($(CLEANPPULINKFILES),)'#010+ + ' -$(DEL) $(CLEANPPULINKFILES)'#010+ + 'endif'#010+ + 'ifdef CLEANRSTFILES'#010+ + ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ + 'endif'#010+ + 'ifdef CLEAN_FILES'#010+ +- ' -$(DEL) $(CLEAN_FILES)'#010+ ++ ' ',' -$(DEL) $(CLEAN_FILES)'#010+ + 'endif'#010+ + 'ifdef LIB_NAME'#010+ +- ' -$(DEL) ','$(LIB_NAME) $(LIB_FULLNAME)'#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)'#010+ + #010+ +- 'fpc_cleanall: $(CLEANTARGET)'#010+ ++ 'fpc_','cleanall: $(CLEANTARGET)'#010+ + 'ifdef CLEANEXEFILES'#010+ +- ' -$(DEL) $','(CLEANEXEFILES)'#010+ ++ ' -$(DEL) $(CLEANEXEFILES)'#010+ + 'endif'#010+ + 'ifdef COMPILER_UNITTARGETDIR'#010+ + 'ifdef CLEANPPUFILES'#010+ +@@ -1982,27 +1986,26 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'ifneq ($(CLEANPPULINKFILES),)'#010+ + ' -$(DEL) $(CLEANPPULINKFILES)'#010+ +- 'endif'#010+ ++ 'e','ndif'#010+ + 'ifdef CLEANRSTFILES'#010+ +- ' -$(DEL) $(addprefix $(UNITTAR','GETDIRPREFIX),$(CLEANRSTFILES))'+ +- #010+ ++ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ + 'endif'#010+ + 'endif'#010+ + 'ifdef CLEAN_FILES'#010+ + ' -$(DEL) $(CLEAN_FILES)'#010+ + 'endif'#010+ + ' -$(DELTREE) units'#010+ +- ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ +- 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ +- 'ifneq ($(PPU','EXT),.ppu)'#010+ ++ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASM','EXT) *$(STATICL'+ ++ 'IBEXT) *$(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+ +- ' -$(DEL) *_ppas$(BATCHEXT)'#010+ ++ ' ',' -$(DEL) *_ppas$(BATCHEXT)'#010+ + 'ifdef AOUTEXT'#010+ +- ' -$(DEL) *$(','AOUTEXT)'#010+ ++ ' -$(DEL) *$(AOUTEXT)'#010+ + 'endif'#010+ + 'ifdef DEBUGSYMEXT'#010+ + ' -$(DEL) *$(DEBUGSYMEXT)'#010+ +@@ -2012,10 +2015,10 @@ const fpcmakeini : array[0..216,1..240] + #010+ + #010+ + '[baseinforules]'#010+ +- '#####################################################################'#010+ +- '# Base info rules'#010+ +- '######################################','##############################'+ ++ '################################################################','####'+ + '#'#010+ ++ '# Base info rules'#010+ ++ '#####################################################################'#010+ + #010+ + '.PHONY: fpc_baseinfo'#010+ + #010+ +@@ -2024,96 +2027,95 @@ const fpcmakeini : array[0..216,1..240] + 'fpc_baseinfo:'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) == Package info =='#010+ +- ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ +- ' @$(ECHO) Package Versi','on.. $(PACKAGE_VERSION)'#010+ ++ ' @$(ECHO) Pac','kage Name..... $(PACKAGE_NAME)'#010+ ++ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) == Configuration info =='#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) FPC.......... $(FPC)'#010+ +- ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ++ ' @$(ECHO) FPC Version.. $(FPC_','VERSION)'#010+ + ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ +- ' ',' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ++ ' @$(ECHO) 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. $(SOURCESUFFIX)'#010+ + ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ + ' @$(ECHO) FPC fpmake... $(FPCFPMAKE)'#010+ + ' @$(ECHO)'#010+ +- ' @$(ECHO) == Directory info =='#010+ ++ ' @$(ECHO) == Directory info =','='#010+ + ' @$(ECHO)'#010+ +- ' @$(ECHO) Required pkgs... $(REQUIR','E_PACKAGES)'#010+ ++ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ + ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ + ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ +- ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ +- ' @$(ECHO) Packa','gesDir..... $(PACKAGESDIR)'#010+ ++ ' ','@$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ++ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ + ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ + ' @$(ECHO)'#010+ +- ' @$(ECHO) == Tools info =='#010+ ++ ' @$(ECHO) =','= Tools info =='#010+ + ' @$(ECHO)'#010+ +- ' @$(ECHO) As........ ','$(AS)'#010+ ++ ' @$(ECHO) 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........ $(RMP','ROG)'#010+ ++ ' @$(','ECHO) Cp........ $(CPPROG)'#010+ ++ ' @$(ECHO) Rm........ $(RMPROG)'#010+ + ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ + ' @$(ECHO) Echo...... $(ECHO)'#010+ + ' @$(ECHO) Shell..... $(SHELL)'#010+ + ' @$(ECHO) Date...... $(DATE)'#010+ +- ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ++ ' @$(ECHO) FP','CMake... $(FPCMAKE)'#010+ + ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ +- ' ',' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ++ ' @$(ECHO) 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_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+ ++ ' @$(EC','HO) Target Examples....... $(TARGET_EXAMPLES)'#010+ ++ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ + ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ +- ' @$(ECHO)'#010+ +- ' @$(ECHO) Install Units....... $(INSTALL_U','NITS)'#010+ ++ ' ',' @$(ECHO)'#010+ ++ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ + ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) == Install info =='#010+ + ' @$(ECHO)'#010+ +- ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ++ ' @$(ECHO) DateStr.............. $(DAT','ESTR)'#010+ + ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ +- ' ',' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#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) F','ullZipName.......... $(FULLZIPNAME)'#010+ ++ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ + ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ +- ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ +- ' @$(E','CHO) 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+ +- ' @$(E','CHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ++ ' @$(E','CHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ++ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ + ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ +- ' @$(ECHO)'#010+ ++ ' ',' @$(ECHO)'#010+ + #010+ + '[inforules]'#010+ +- '##################################','##################################'+ +- '#'#010+ ++ '#####################################################################'#010+ + '# Info rules'#010+ + '#####################################################################'#010+ + #010+ +@@ -2121,18 +2123,17 @@ const fpcmakeini : array[0..216,1..240] + #010+ + 'fpc_info: $(INFORULES)'#010+ + #010+ +- '[makefilerules]'#010+ +- '##############################################################','######'+ +- '#'#010+ ++ '[makefilerules]'#010, ++ '#####################################################################'#010+ + '# Rebuild Makefile'#010+ + '#####################################################################'#010+ + #010+ + '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ + ' \'#010+ +- ' fpc_makefile_dirs'#010+ ++ ' ',' 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+ + 'fpc_makefile_sub1:'#010+ + 'ifdef TARGET_DIRS'#010+ +@@ -2140,8 +2141,8 @@ const fpcmakeini : array[0..216,1..240] + '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+ + 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ +@@ -2149,42 +2150,40 @@ const fpcmakeini : array[0..216,1..240] + #010+ + 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ + #010+ +- 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ ++ 'fpc_makefiles:',' fpc_makefile fpc_makefile_dirs'#010+ + #010+ + '[localmakefile]'#010+ +- '#############','#######################################################'+ +- '#'#010+ ++ '#####################################################################'#010+ + '# Local Makefile'#010+ + '#####################################################################'#010+ + #010+ +- 'ifneq ($(wildcard fpcmake.loc),)'#010+ ++ 'ifneq ($(wildcard fpcmake.loc),)'#010, + 'include fpcmake.loc'#010+ + 'endif'#010+ + #010+ + #010+ + '[userrules]'#010+ +- '######################','##############################################'+ +- '#'#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+ + 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ + 'LCL_PLATFORM=win32'#010+ + 'else'#010+ +- 'LCL_PLATFORM=gtk'#010+ ++ 'LCL_PLATFORM=g','tk'#010+ + 'endif'#010+ + 'endif'#010+ + 'export LCL_PLATFORM'#010+ + #010+ +- '# Check if the specified L','CLDIR is correct'#010+ ++ '# Check if the specified LCLDIR is correct'#010+ + 'ifdef LCLDIR'#010+ + 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ + 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ +@@ -2192,10 +2191,10 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + 'else'#010+ + 'override LCLDIR=wrong'#010+ +- 'endif'#010+ ++ 'e','ndif'#010+ + #010+ + '# Check if the default LCLDIR is correct'#010+ +- 'ifdef DEFAULT_L','CLDIR'#010+ ++ 'ifdef DEFAULT_LCLDIR'#010+ + 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ + 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'override LCLDIR=wrong'#010+ +@@ -2203,48 +2202,49 @@ const fpcmakeini : array[0..216,1..240] + 'endif'#010+ + #010+ + '# Check for development version'#010+ +- 'ifeq ($(LCLDIR),wrong)'#010+ +- 'override LCLDIR=$(subst /units/$(LCL_PLATFOR','M),,$(firstword $(wildca'+ +- 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ ++ 'ifeq ','($(LCLDIR),wrong)'#010+ ++ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ++ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'ifeq ($(LCLDIR),)'#010+ + 'override LCLDIR=wrong'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ + '# Check for release version'#010+ +- 'ifeq ($(LCLDIR),wrong)'#010+ +- 'override LCLDIR=$(subst /units/$(LCL_PLATFOR','M),,$(firstword $(wildca'+ +- 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ ++ 'ifeq ','($(LCLDIR),wrong)'#010+ ++ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ++ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'ifeq ($(LCLDIR),)'#010+ + 'override LCLDIR=wrong'#010+ + 'endif'#010+ + 'endif'#010+ + #010+ + '# Generate dirs'#010+ +- 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ +- 'IR)/uni','ts)'#010+ ++ 'override LCLUNI','TDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(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+ ++ 'override REQ','UIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ ++ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ + #010+ + '[lclinforules]'#010+ + '#####################################################################'#010+ + '# LCL Info rules'#010+ +- '#####################################################################'#010+ ++ '###########################################################','#########'+ ++ '#'#010+ + 'override INFORULES+=lclinfo'#010+ + #010+ + '.PHONY: lclinfo'#010+ + #010+ +- 'lclin','fo:'#010+ ++ 'lclinfo:'#010+ + ' @$(ECHO) == LCL info =='#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ + ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ +- ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ +- ' @$(ECHO) LCL Comp','onent dir.... $(LCLCOMPONENTDIR)'#010+ ++ ' @$(ECHO) ','LCL Unit dir......... $(LCLUNITDIR)'#010+ ++ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ + ' @$(ECHO)'#010 + ); +--- fpc-2.6.4+dfsg.orig/fpcsrc/utils/fpcm/fpcmake.ini ++++ fpc-2.6.4+dfsg/fpcsrc/utils/fpcm/fpcmake.ini +@@ -302,6 +302,10 @@ ifeq ($(OS_TARGET),linux) linuxHier=1 endif @@ -13,7 +2131,7 @@ Index: fpc/fpcsrc/utils/fpcm/fpcmake.ini export OS_TARGET OS_SOURCE ARCH CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SOURCE TARGETSUFFIX SOURCESUFFIX CROSSCOMPILE [fpmakefpcdetect] -@@ -949,6 +953,7 @@ +@@ -949,6 +953,7 @@ endif ifeq ($(OS_TARGET),solaris) BATCHEXT=.sh EXEEXT= diff --git a/debian/patches/series b/debian/patches/series index 81ced2e9..dab4317e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -17,6 +17,6 @@ fix-733618.patch change-path-of-localization-files-to-fit-Debian-standar.patch fix-encoding-of-localization-files-to-be-utf8.patch dyson-solaris-gnutoolchain.patch -dyson-fpcmake.ini.patch dyson-libs.patch dyson-components.patch +dyson-fpcmake.ini.patch |