* reverted merge of r2942 (-O2 only implies -Or in 2.1.x and later)

git-svn-id: branches/fixes_2_0@3966 -
This commit is contained in:
Jonas Maebe 2006-06-26 10:53:14 +00:00
parent 9bafba7029
commit 5e27a28927
2 changed files with 108 additions and 108 deletions

View File

@ -1349,7 +1349,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'FPCCPUOPT:=-O1r'#010+ 'FPCCPUOPT:=-O1r'#010+
'endif'#010+ 'endif'#010+
'else'#010+ 'else'#010+
'FPCCPUOPT:=-O2'#010+ 'FPCCPUOPT:=-O1r'#010+
'endif'#010+ 'endif'#010+
'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+
'override FPCOPTDEF+=RELEASE'#010+ 'override FPCOPTDEF+=RELEASE'#010+
@ -1363,7 +1363,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'# Optimizer'#010+ '# Optimizer'#010+
'ifdef OPTIMIZE'#010+ 'ifdef OPTIMIZE'#010+
'override FPCOPT+=-O2'#010+ 'override FPCOPT+=-O2'#010+
'endif',#010+ 'endi','f'#010+
#010+ #010+
'# Verbose settings (warning,note,info)'#010+ '# Verbose settings (warning,note,info)'#010+
'ifdef VERBOSE'#010+ 'ifdef VERBOSE'#010+
@ -1375,7 +1375,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
'endif'#010+ 'endif'#010+
'ifdef COMPILER_UNITDIR'#010+ 'ifdef COMPILER_UNITDIR'#010+
'override FPCOPT+=$(addprefix -Fu,$(COMPI','LER_UNITDIR))'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMP','ILER_UNITDIR))'#010+
'endif'#010+ 'endif'#010+
'ifdef COMPILER_LIBRARYDIR'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+
'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
@ -1384,7 +1384,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+
'endif'#010+ 'endif'#010+
'ifdef COMPILER_INCLUDEDIR'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+
'override FPCOPT+=$','(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ 'override FPCOPT+=','$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# Cross compiler utils'#010+ '# Cross compiler utils'#010+
@ -1394,7 +1394,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'# Target dirs and the prefix to use for clean/install'#010+ '# Target dirs and the prefix to use for clean/install'#010+
'ifdef COMPILER_TARGETDIR'#010+ 'ifdef COMPILER_TARGETDIR'#010+
'override FPCOPT+=-FE$(COMPILER_T','ARGETDIR)'#010+ 'override FPCOPT+=-FE$(COMPILER_','TARGETDIR)'#010+
'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'ifeq ($(COMPILER_TARGETDIR),.)'#010+
'override TARGETDIRPREFIX='#010+ 'override TARGETDIRPREFIX='#010+
'else'#010+ 'else'#010+
@ -1404,7 +1404,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'# Unit target dir (default is units/<cpu>-<os>/'#010+ '# Unit target dir (default is units/<cpu>-<os>/'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+
'override FPCOPT+=-FU$(COMPILER','_UNITTARGETDIR)'#010+ 'override FPCOPT+=-FU$(COMPILE','R_UNITTARGETDIR)'#010+
'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
'override UNITTARGETDIRPREFIX='#010+ 'override UNITTARGETDIRPREFIX='#010+
'else'#010+ 'else'#010+
@ -1413,7 +1413,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'else'#010+ 'else'#010+
'ifdef COMPILER_TARGETDIR'#010+ 'ifdef COMPILER_TARGETDIR'#010+
'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+
'override',' UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'overrid','e UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -1431,7 +1431,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
#010+ #010+
#010+ #010+
'[command_li','bc]'#010+ '[command_l','ibc]'#010+
'# Add GCC lib path if asked'#010+ '# Add GCC lib path if asked'#010+
'ifdef GCCLIBDIR'#010+ 'ifdef GCCLIBDIR'#010+
'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
@ -1444,7 +1444,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'[command_end]'#010+ '[command_end]'#010+
'# Add commandline options last so they can override'#010+ '# Add commandline options last so they can override'#010+
'ifdef OPT'#010+ 'ifdef OPT'#010+
'ov','erride FPCOPT+=$(OPT)'#010+ 'o','verride FPCOPT+=$(OPT)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# Add defines from FPCOPTDEF to FPCOPT'#010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+
@ -1457,7 +1457,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'override FPCOPT+=@$(CFGFILE)'#010+ 'override FPCOPT+=@$(CFGFILE)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# Use the environment',' to pass commandline options?'#010+ '# Use the environmen','t to pass commandline options?'#010+
'ifdef USEENV'#010+ 'ifdef USEENV'#010+
'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+
'override FPCOPT:=!FPCEXTCMD'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+
@ -1467,7 +1467,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
#010+ #010+
'ifneq ($(AFULL_T','ARGET),$(AFULL_SOURCE))'#010+ 'ifneq ($(AFULL_','TARGET),$(AFULL_SOURCE))'#010+
'override ACROSSCOMPILE=1'#010+ 'override ACROSSCOMPILE=1'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -1479,7 +1479,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'override COMPILER:=$(FPC) $(FPCOPT)'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+
#010+ #010+
'# also call ppas if with command option -s'#010+ '# also call ppas if with command option -s'#010+
'# but only if the FULL_SO','URCE and FULL_TARGET are equal'#010+ '# but only if the FULL_S','OURCE and FULL_TARGET are equal'#010+
'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
'EXECPPAS='#010+ 'EXECPPAS='#010+
'else'#010+ 'else'#010+
@ -1491,7 +1491,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'[loaderrules]'#010+ '[loaderrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# ','Loaders'#010+ '#',' Loaders'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'.PHONY: fpc_loaders'#010+ '.PHONY: fpc_loaders'#010+
@ -1499,7 +1499,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'ifneq ($(TARGET_LOADERS),)'#010+ 'ifneq ($(TARGET_LOADERS),)'#010+
'override ALLTARGET+=fpc_loaders'#010+ 'override ALLTARGET+=fpc_loaders'#010+
'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+
'override INSTALLTARGET+=fpc_loaders_insta','ll'#010+ 'override INSTALLTARGET+=fpc_loaders_inst','all'#010+
#010+ #010+
'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+
'endif'#010+ 'endif'#010+
@ -1511,7 +1511,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' $(AS) -o $*$(OEXT) $<'#010+ ' $(AS) -o $*$(OEXT) $<'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_loaders: $(C','OMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ 'fpc_loaders: $(','COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+
#010+ #010+
'fpc_loaders_clean:'#010+ 'fpc_loaders_clean:'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+
@ -1522,7 +1522,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_loaders_install:'#010+ 'fpc_loaders_install:'#010+
' $(MKDIR',') $(INSTALL_UNITDIR)'#010+ ' $(MKDI','R) $(INSTALL_UNITDIR)'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+
' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+
'ES)) $(INSTALL_UNITDIR)'#010+ 'ES)) $(INSTALL_UNITDIR)'#010+
@ -1532,7 +1532,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
#010+ #010+
'[unitrules]'#010+ '[unitrules]'#010+
'#################','###################################################'+ '################','####################################################'+
'#'#010+ '#'#010+
'# Units'#010+ '# Units'#010+
'#####################################################################'#010+ '#####################################################################'#010+
@ -1542,12 +1542,12 @@ const fpcmakeini : array[0..212,1..240] of char=(
'ifneq ($(TARGET_UNITS),)'#010+ 'ifneq ($(TARGET_UNITS),)'#010+
'override ALLTARGET+=fpc_units'#010+ 'override ALLTARGET+=fpc_units'#010+
#010+ #010+
'override UNITPPUFILES=$(addsuffix',' $(PPUEXT),$(TARGET_UNITS))'#010+ 'override UNITPPUFILES=$(addsuffi','x $(PPUEXT),$(TARGET_UNITS))'#010+
'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+
'NITS))'#010+ 'NITS))'#010+
'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
'endif',#010+ 'endi','f'#010+
#010+ #010+
'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+
#010+ #010+
@ -1559,18 +1559,18 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'.PHONY: fpc_exes'#010+ '.PHONY: fpc_exes'#010+
#010+ #010+
'# Prog','rams are not needed for a cross installation'#010+ '# Pro','grams are not needed for a cross installation'#010+
'ifndef CROSSINSTALL'#010+ 'ifndef CROSSINSTALL'#010+
'ifneq ($(TARGET_PROGRAMS),)'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+
'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
'x $(STATICLIBPREF','IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ 'x $(STATICLIBPRE','FIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+
') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+
'PROGRAMS)))'#010+ 'PROGRAMS)))'#010+
#010+ #010+
'override ALLTARGET+=fpc_exes'#010+ 'override ALLTARGET+=fpc_exes'#010+
'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+
'override CLEANEXEFILES+=$(EXEFILES) $(E','XEOFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(','EXEOFILES)'#010+
'ifeq ($(OS_TARGET),os2)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
'endif'#010+ 'endif'#010+
@ -1580,7 +1580,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_exes: $(COMPILER_TA','RGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES'+ 'fpc_exes: $(COMPILER_T','ARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES'+
')'#010+ ')'#010+
#010+ #010+
#010+ #010+
@ -1590,7 +1590,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'ifdef TARGET_RSTS'#010+ 'ifdef TARGET_RSTS'#010+
'ov','erride RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ 'o','verride RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+
#010+ #010+
'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+
'endif'#010+ 'endif'#010+
@ -1599,7 +1599,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'[examplerules]'#010+ '[examplerules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Examples'#010+ '# Examples'#010+
'#############################################','#######################'+ '############################################','########################'+
'#'#010+ '#'#010+
#010+ #010+
'.PHONY: fpc_examples'#010+ '.PHONY: fpc_examples'#010+
@ -1608,17 +1608,17 @@ const fpcmakeini : array[0..212,1..240] of char=(
'HASEXAMPLES=1'#010+ 'HASEXAMPLES=1'#010+
'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+
'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_E'+ 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_E'+
'XAMPLES)) ','$(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ 'XAMPLES))',' $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMP','L'+ 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAM','PL'+
'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+
'GET_EXAMPLES)))'#010+ 'GET_EXAMPLES)))'#010+
#010+ #010+
'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
'ifeq ($(OS_TARGET),os2)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
'endi','f'#010+ 'end','if'#010+
'ifeq ($(OS_TARGET),emx)'#010+ 'ifeq ($(OS_TARGET),emx)'#010+
'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
'endif'#010+ 'endif'#010+
@ -1631,14 +1631,14 @@ const fpcmakeini : array[0..212,1..240] of char=(
'S))'#010+ 'S))'#010+
#010+ #010+
#010+ #010+
'[compil','erules]'#010+ '[compi','lerules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# General compile rules'#010+ '# General compile rules'#010+
'#####################################################################'#010+ '#####################################################################'#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+ #010+
'$(FPCMA','DE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ '$(FPCM','ADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
#010+ #010+
'fpc_all: $(FPCMADE)'#010+ 'fpc_all: $(FPCMADE)'#010+
@ -1650,7 +1650,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' $(MAKE) all DEBUG=1'#010+ ' $(MAKE) all DEBUG=1'#010+
#010+ #010+
'fpc_release:'#010+ 'fpc_release:'#010+
' $(MAKE) all RELEAS','E=1'#010+ ' $(MAKE) all RELEA','SE=1'#010+
#010+ #010+
'# General compile rules, available for both possible .pp and .pas exte'+ '# General compile rules, available for both possible .pp and .pas exte'+
'nsions'#010+ 'nsions'#010+
@ -1660,7 +1660,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'$(COMPILER_UNITTARGETDIR):'#010+ '$(COMPILER_UNITTARGETDIR):'#010+
' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ ' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
#010+ #010+
'$(COMPILER_TAR','GETDIR):'#010+ '$(COMPILER_TA','RGETDIR):'#010+
' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+
#010+ #010+
'%$(PPUEXT): %.pp'#010+ '%$(PPUEXT): %.pp'#010+
@ -1675,7 +1675,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' $(COMPILER) $<'#010+ ' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+ ' $(EXECPPAS)'#010+
#010+ #010+
'%$(','EXEEXT): %.pas'#010+ '%$','(EXEEXT): %.pas'#010+
' $(COMPILER) $<'#010+ ' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+ ' $(EXECPPAS)'#010+
#010+ #010+
@ -1690,18 +1690,18 @@ const fpcmakeini : array[0..212,1..240] of char=(
'%.res: %.rc'#010+ '%.res: %.rc'#010+
' windres -i $< -o $@'#010+ ' windres -i $< -o $@'#010+
#010+ #010+
'# Search paths f','or .ppu, .pp, .pas, .lpr, .dpr'#010+ '# Search paths ','for .ppu, .pp, .pas, .lpr, .dpr'#010+
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.dpr $(COMPILER_SOURCEDIR) $(COM','PILER_INCLUDEDIR)'#010+ 'vpath %.dpr $(COMPILER_SOURCEDIR) $(CO','MPILER_INCLUDEDIR)'#010+
'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
#010+ #010+
'[sharedrules]'#010+ '[sharedrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Library'#010+ '# Library'#010+
'###########################################','#########################'+ '##########################################','##########################'+
'#'#010+ '#'#010+
#010+ #010+
'.PHONY: fpc_shared'#010+ '.PHONY: fpc_shared'#010+
@ -1716,7 +1716,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'ifndef SHARED_FULLNAME'#010, 'ifndef SHARED_FULLNAME',#010+
'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+
'N)$(SHAREDLIBEXT)'#010+ 'N)$(SHAREDLIBEXT)'#010+
'endif'#010+ 'endif'#010+
@ -1724,7 +1724,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'# Default sharedlib units are all unit objects'#010+ '# Default sharedlib units are all unit objects'#010+
'ifndef SHARED_LIBUNITS'#010+ 'ifndef SHARED_LIBUNITS'#010+
'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+ 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
'override SHARED_LI','BUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED'+ 'override SHARED_L','IBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED'+
'_LIBUNITS))'#010+ '_LIBUNITS))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -1732,7 +1732,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'ifdef HASSHAREDLIB'#010+ 'ifdef HASSHAREDLIB'#010+
' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
'ifneq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+
' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILE','R_UNITTARGETDIR)'+ ' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPIL','ER_UNITTARGETDIR)'+
' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+
'endif'#010+ 'endif'#010+
'else'#010+ 'else'#010+
@ -1742,7 +1742,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'fpc_shared_install:'#010+ 'fpc_shared_install:'#010+
'ifneq ($(SHARED_BUILD),n)'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+
'ifneq ($(SHARED_LIBUNITS),)'#010+ 'ifneq ($(SHARED_LIBUNITS),)'#010+
'ifneq ($(wildcard $(COMPILER_UNITT','ARGETDIR)/$(SHARED_FULLNAME)),)'#010+ 'ifneq ($(wildcard $(COMPILER_UNIT','TARGETDIR)/$(SHARED_FULLNAME)),)'#010+
' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
'ALL_SHAREDDIR)'#010+ 'ALL_SHAREDDIR)'#010+
'endif'#010+ 'endif'#010+
@ -1752,7 +1752,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'[installrules]'#010+ '[installrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Install rules'#010+ '# Install rules'#010+
'###','#################################################################'+ '##','##################################################################'+
'#'#010+ '#'#010+
#010+ #010+
'.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
@ -1761,19 +1761,19 @@ const fpcmakeini : array[0..212,1..240] of char=(
'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'ifdef INSTALL_BUILDUN','IT'#010+ 'ifdef INSTALL_BUILDU','NIT'#010+
'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+
'(INSTALLPPUFILES))'#010+ '(INSTALLPPUFILES))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'ifdef INSTALLPPUFILES'#010+ 'ifdef INSTALLPPUFILES'#010+
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PP','UEXT),$(STATICLIBEX'+ 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(P','PUEXT),$(STATICLIBEX'+
'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+
'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+
'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir '+
'$(INSTALL','PPUFILES)))'#010+ '$(INSTAL','LPPUFILES)))'#010+
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+
'endif'#010+ 'endif'#010+
@ -1782,7 +1782,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
#010+ #010+
'ifdef INSTALLEXEFILES'#010+ 'ifdef INSTALLEXEFILES'#010+
'ifneq ($(TARG','ETDIRPREFIX),)'#010+ 'ifneq ($(TAR','GETDIRPREFIX),)'#010+
'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+
'STALLEXEFILES)))'#010+ 'STALLEXEFILES)))'#010+
'endif'#010+ 'endif'#010+
@ -1791,7 +1791,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'fpc_install: all $(INSTALLTARGET)'#010+ 'fpc_install: all $(INSTALLTARGET)'#010+
'ifdef INSTALLEXEFILES'#010+ 'ifdef INSTALLEXEFILES'#010+
' $(MKDIR) $(INSTALL_BINDIR)'#010+ ' $(MKDIR) $(INSTALL_BINDIR)'#010+
'# Compress the exes if upx is defi','ned'#010+ '# Compress the exes if upx is def','ined'#010+
'ifdef UPXPROG'#010+ 'ifdef UPXPROG'#010+
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
'endif'#010+ 'endif'#010+
@ -1799,14 +1799,14 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+
'ifdef FPCMAKE'#010+ 'ifdef FPCMAKE'#010+
'# If the fpcpackage variable is set then create and install Package','.'+ '# If the fpcpackage variable is set then create and install Packag','e.'+
'fpc,'#010+ 'fpc,'#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+ 'ifdef PACKAGE_VERSION'#010+
'ifneq ($(wildcard Makefile.fpc),)'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+
' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) Packa','ge.fpc $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) Pack','age.fpc $(INSTALL_UNITDIR)'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
@ -1815,7 +1815,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+
' $(INSTALL) $(INSTALLPPULINKFILES) $','(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) ','$(INSTALL_UNITDIR)'#010+
'endif'#010+ 'endif'#010+
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+
@ -1824,7 +1824,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
'endif',#010+ 'endi','f'#010+
'ifdef INSTALL_FILES'#010+ 'ifdef INSTALL_FILES'#010+
' $(MKDIR) $(INSTALL_DATADIR)'#010+ ' $(MKDIR) $(INSTALL_DATADIR)'#010+
' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
@ -1832,7 +1832,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'fpc_sourceinstall: distclean'#010+ 'fpc_sourceinstall: distclean'#010+
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010, ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)',#010+
#010+ #010+
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
'ifdef HASEXAMPLES'#010+ 'ifdef HASEXAMPLES'#010+
@ -1841,7 +1841,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'ifdef EXAMPLESOURCEFILES'#010+ 'ifdef EXAMPLESOURCEFILES'#010+
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+ 'endif'#010+
'ifdef TARGET_EXAMPL','EDIRS'#010+ 'ifdef TARGET_EXAMP','LEDIRS'#010+
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
'AMPLEDIR)'#010+ 'AMPLEDIR)'#010+
'endif'#010+ 'endif'#010+
@ -1849,7 +1849,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'[distinstallrules]'#010+ '[distinstallrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Dist Install'#010+ '# Dist Install'#010+
'###########################################','#########################'+ '##########################################','##########################'+
'#'#010+ '#'#010+
#010+ #010+
'.PHONY: fpc_distinstall'#010+ '.PHONY: fpc_distinstall'#010+
@ -1860,7 +1860,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'[zipinstallrules]'#010+ '[zipinstallrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Zip'#010+ '# Zip'#010+
'###################################################','#################'+ '##################################################','##################'+
'#'#010+ '#'#010+
#010+ #010+
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
@ -1868,7 +1868,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'# Temporary path to pack 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+ '# subdir, because the deltree can'#039't see the whole tree to remove'#010+
'ifndef PACKDIR'#010+ 'ifndef PACKDIR'#010+
'ifndef inUnix',#010+ 'ifndef inUni','x'#010+
'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
'else'#010+ 'else'#010+
'PACKDIR=/tmp/fpc-pack'#010+ 'PACKDIR=/tmp/fpc-pack'#010+
@ -1884,8 +1884,8 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'ifndef FULLZIPNAME'#010+ 'ifndef FULLZIPNAME'#010,
'F','ULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# ZipTarget'#010+ '# ZipTarget'#010+
@ -1899,7 +1899,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'# Use tar by default under linux'#010+ '# Use tar by default under linux'#010+
'ifndef USEZIP'#010+ 'ifndef USEZIP'#010+
'ifdef inUnix',#010+ 'ifdef inUni','x'#010+
'USETAR=1'#010+ 'USETAR=1'#010+
'endif'#010+ 'endif'#010+
'endif'#010+ 'endif'#010+
@ -1913,7 +1913,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'# the path separator'#010+ '# the path separator'#010+
'ifdef USEZIPWRAPPER'#010+ 'ifdef USEZIPWRAPPER'#010+
'ZIPPATHSEP=$(PATHSEP)'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+
'ZIPWRAPPER=$(subst /,','$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)'+ 'ZIPWRAPPER=$(subst /',',$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)'+
')'#010+ ')'#010+
'else'#010+ 'else'#010+
'ZIPPATHSEP=/'#010+ 'ZIPPATHSEP=/'#010+
@ -1922,13 +1922,13 @@ const fpcmakeini : array[0..212,1..240] of char=(
'# 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_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
'ifdef USETAR'#010, 'ifdef USETAR',#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
'else'#010+ 'else'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
'TFILE) ','*'#010+ 'TFILE)',' *'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'fpc_zipinstall:'#010+ 'fpc_zipinstall:'#010+
@ -1937,14 +1937,14 @@ const fpcmakeini : array[0..212,1..240] of char=(
' $(DEL) $(ZIPDESTFILE)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+
'ifdef USEZIPWRAPPER'#010+ 'ifdef USEZIPWRAPPER'#010+
'# Handle gecho separate as we need to espace \ with \\'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+
'ifneq ($(','ECHOREDIR),echo)'#010+ 'ifneq ($','(ECHOREDIR),echo)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
'R)'#010+ 'R)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
#010+ #010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
'ER)'#010+ 'ER)'#010+
'else'#010, 'else',#010+
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
@ -1954,7 +1954,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'else'#010+ 'else'#010+
' $(ZIPWRAPPER)'#010+ ' $(ZIPWRAPPER)'#010+
'endif'#010+ 'endif'#010+
' $(DEL) $(ZIPW','RAPPER)'#010+ ' $(DEL) $(ZIP','WRAPPER)'#010+
'else'#010+ 'else'#010+
' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
'endif'#010+ 'endif'#010+
@ -1964,7 +1964,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+
'SOURCESUFFIX)'#010+ 'SOURCESUFFIX)'#010+
#010+ #010+
'fpc_zipexampleinstall:'#010, 'fpc_zipexampleinstall:',#010+
'ifdef HASEXAMPLES'#010+ 'ifdef HASEXAMPLES'#010+
' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
'PEXAMPLESUFFIX)'#010+ 'PEXAMPLESUFFIX)'#010+
@ -1975,7 +1975,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
#010+ #010+
'[cleanrules]'#010+ '[cleanrules]'#010+
'#########################################','###########################'+ '########################################','############################'+
'#'#010+ '#'#010+
'# Clean rules'#010+ '# Clean rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
@ -1983,7 +1983,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
#010+ #010+
'ifdef EXEFILES'#010+ 'ifdef EXEFILES'#010+
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXE','FIL'+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEX','EFIL'+
'ES))'#010+ 'ES))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -1993,14 +1993,14 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'ifdef CLEANPPUFILES'#010+ 'ifdef CLEANPPUFILES'#010+
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEX','T),$(STATICLIBEXT),$'+ ') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUE','XT),$(STATICLIBEXT),$'+
'(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+
'TATICLIBEXT),$(CLEANPPUFILES)))'#010+ 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+
'ifdef DEBUGSYMEXT'#010+ 'ifdef DEBUGSYMEXT'#010+
'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
'UFILES))'#010+ 'UFILES))'#010+
'endif'#010+ 'endif'#010+
'override CLEANP','PUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+ 'override CLEAN','PPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPP'+
'UFILES))'#010+ 'UFILES))'#010+
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
'IX),$(CLEANPPULINKFILES)))'#010+ 'IX),$(CLEANPPULINKFILES)))'#010+
@ -2008,7 +2008,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'fpc_clean: $(CLEANTARGET)'#010+ 'fpc_clean: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+ 'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFI','LES)'#010+ ' -$(DEL) $(CLEANEXEF','ILES)'#010+
'endif'#010+ 'endif'#010+
'ifdef CLEANPPUFILES'#010+ 'ifdef CLEANPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+
@ -2019,7 +2019,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'ifdef CLEANRSTFILES'#010+ 'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
'endif'#010+ 'endif'#010+
'if','def CLEAN_FILES'#010+ 'i','fdef CLEAN_FILES'#010+
' -$(DEL) $(CLEAN_FILES)'#010+ ' -$(DEL) $(CLEAN_FILES)'#010+
'endif'#010+ 'endif'#010+
'ifdef LIB_NAME'#010+ 'ifdef LIB_NAME'#010+
@ -2027,7 +2027,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
'PCEXTFILE) $(REDIRFILE)'#010+ 'PCEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *$(ASMEXT) *','_ppas$(BATCHEXT)'#010+ ' -$(DEL) *$(ASMEXT) ','*_ppas$(BATCHEXT)'#010+
#010+ #010+
'fpc_cleanall: $(CLEANTARGET)'#010+ 'fpc_cleanall: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+ 'ifdef CLEANEXEFILES'#010+
@ -2038,7 +2038,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' -$(DEL) $(CLEANPPUFILES)'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+ 'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) ','$(CLEANPPULINKFILES)'#010+ ' -$(DEL)',' $(CLEANPPULINKFILES)'#010+
'endif'#010+ 'endif'#010+
'ifdef CLEANRSTFILES'#010+ 'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
@ -2046,7 +2046,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
' -$(DELTREE) units'#010+ ' -$(DELTREE) units'#010+
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
'EXT) *$(SHAREDLI','BEXT) *$(PPLEXT)'#010+ 'EXT) *$(SHAREDL','IBEXT) *$(PPLEXT)'#010+
'ifneq ($(PPUEXT),.ppu)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+
' -$(DEL) *.o *.ppu *.a'#010+ ' -$(DEL) *.o *.ppu *.a'#010+
'endif'#010+ 'endif'#010+
@ -2054,7 +2054,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+ ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+
'CEXTFILE) $(REDIRFILE)'#010+ 'CEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *_ppas$(BATCHEXT)'#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#010+
'ifde','f AOUTEXT'#010+ 'ifd','ef AOUTEXT'#010+
' -$(DEL) *$(AOUTEXT)'#010+ ' -$(DEL) *$(AOUTEXT)'#010+
'endif'#010+ 'endif'#010+
'ifdef DEBUGSYMEXT'#010+ 'ifdef DEBUGSYMEXT'#010+
@ -2067,7 +2067,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'[baseinforules]'#010+ '[baseinforules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Base info rules'#010+ '# Base info rules'#010+
'#########','###########################################################'+ '########','############################################################'+
'#'#010+ '#'#010+
#010+ #010+
'.PHONY: fpc_baseinfo'#010+ '.PHONY: fpc_baseinfo'#010+
@ -2078,30 +2078,30 @@ const fpcmakeini : array[0..212,1..240] of char=(
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Package info =='#010+ ' @$(ECHO) == Package info =='#010+
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
' ',' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' ',' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO) == Configuration info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) FPC.......... $(FPC)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
' @$(ECHO) Source',' CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Sourc','e CPU... $(CPU_SOURCE)'#010+
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+
' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+
' @$(ECHO) Full Target.. $(F','ULL_TARGET)'#010+ ' @$(ECHO) Full Target.. $(','FULL_TARGET)'#010+
' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Directory info =='#010+ ' @$(ECHO) == Directory info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
' ',' @$(ECHO)'#010+ ' ',' @$(ECHO)'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
' @$(ECHO) PackagesDir..... $(PA','CKAGESDIR)'#010+ ' @$(ECHO) PackagesDir..... $(P','ACKAGESDIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
@ -2109,55 +2109,55 @@ const fpcmakeini : array[0..212,1..240] of char=(
' @$(ECHO) == Tools info =='#010+ ' @$(ECHO) == Tools info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) As........ $(AS)'#010+
' @$','(ECHO) Ld........ $(LD)'#010+ ' @','$(ECHO) Ld........ $(LD)'#010+
' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+
' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+
' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+
' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+
' @$(','ECHO) GInstall.. $(GINSTALL)'#010+ ' @$','(ECHO) GInstall.. $(GINSTALL)'#010+
' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+
' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+
' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
' @$(ECHO) ','Upx....... $(UPXPROG)'#010+ ' @$(ECHO) ',' Upx....... $(UPXPROG)'#010+
' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+ ' @$(ECHO) == Object info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
' @$(ECHO) Target Units.......... $(TARGET','_UNITS)'#010+ ' @$(ECHO) Target Units.......... $(TARGE','T_UNITS)'#010+
' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+
' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
' @$(ECHO) Target Examples....... $(TARGET_E','XAMPLES)'#010+ ' @$(ECHO) Target Examples....... $(TARGET_','EXAMPLES)'#010+
' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Install ','Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install',' Units....... $(INSTALL_UNITS)'#010+
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) == Install info =='#010+ ' @$(ECHO) == Install info =='#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+
' @$(ECHO) ZipName.......','....... $(ZIPNAME)'#010+ ' @$(ECHO) ZipName......','........ $(ZIPNAME)'#010+
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
' ',' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' ',' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+
' @$(ECHO) Install library dir.. $(INST','ALL_LIBDIR)'#010+ ' @$(ECHO) Install library dir.. $(INS','TALL_LIBDIR)'#010+
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
' @$(ECHO) Install example dir.. $(INSTALL_','EXAMPLEDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL','_EXAMPLEDIR)'#010+
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
@ -2165,7 +2165,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' @$(ECHO)'#010+ ' @$(ECHO)'#010+
#010+ #010+
'[inforules]'#010+ '[inforules]'#010+
'##########','##########################################################'+ '#########','###########################################################'+
'#'#010+ '#'#010+
'# Info rules'#010+ '# Info rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
@ -2175,7 +2175,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'fpc_info: $(INFORULES)'#010+ 'fpc_info: $(INFORULES)'#010+
#010+ #010+
'[makefilerules]'#010+ '[makefilerules]'#010+
'######################################','##############################'+ '#####################################','###############################'+
'#'#010+ '#'#010+
'# Rebuild Makefile'#010+ '# Rebuild Makefile'#010+
'#####################################################################'#010+ '#####################################################################'#010+
@ -2185,7 +2185,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
' fpc_makefile_dirs'#010+ ' fpc_makefile_dirs'#010+
#010+ #010+
'fpc_makefile:'#010+ 'fpc_makefile:'#010+
' ',' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ ' ',' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
#010+ #010+
'fpc_makefile_sub1:'#010+ 'fpc_makefile_sub1:'#010+
'ifdef TARGET_DIRS'#010+ 'ifdef TARGET_DIRS'#010+
@ -2193,7 +2193,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'T_DIRS))'#010+ 'T_DIRS))'#010+
'endif'#010+ 'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuff','ix /Makefile.fpc,$(TAR'+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuf','fix /Makefile.fpc,$(TAR'+
'GET_EXAMPLEDIRS))'#010+ 'GET_EXAMPLEDIRS))'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
@ -2204,7 +2204,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
#010+ #010+
'[loca','lmakefile]'#010+ '[loc','almakefile]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Local Makefile'#010+ '# Local Makefile'#010+
'#####################################################################'#010+ '#####################################################################'#010+
@ -2214,14 +2214,14 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
#010+ #010+
#010+ #010+
'[userrules',']'#010+ '[userrule','s]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# Users rules'#010+ '# Users rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'[lclrules]'#010+ '[lclrules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# ','LCL Rules'#010+ '#',' LCL Rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
#010+ #010+
'# LCL Platform'#010+ '# LCL Platform'#010+
@ -2234,7 +2234,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
'export LCL_PLATFORM'#010+ 'export LCL_PLATFORM'#010+
#010+ #010+
'# ','Check if the specified LCLDIR is correct'#010+ '#',' Check if the specified LCLDIR is correct'#010+
'ifdef LCLDIR'#010+ 'ifdef LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+ 'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
@ -2244,7 +2244,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
'override LCLDIR=wrong'#010+ 'override LCLDIR=wrong'#010+
'endif'#010+ 'endif'#010+
#010+ #010+
'# Check if the default LCLDIR is',' correct'#010+ '# Check if the default LCLDIR i','s correct'#010+
'ifdef DEFAULT_LCLDIR'#010+ 'ifdef DEFAULT_LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
@ -2254,7 +2254,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'# Check for development version'#010+ '# Check for development version'#010+
'ifeq ($(LCLDIR),wrong)'#010+ 'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(su','bst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ 'override LCLDIR=$(s','ubst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+
'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
'ifeq ($(LCLDIR),)'#010+ 'ifeq ($(LCLDIR),)'#010+
'override LCLDIR=wrong'#010+ 'override LCLDIR=wrong'#010+
@ -2263,7 +2263,7 @@ const fpcmakeini : array[0..212,1..240] of char=(
#010+ #010+
'# Check for release version'#010+ '# Check for release version'#010+
'ifeq ($(LCLDIR),wrong)'#010+ 'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(su','bst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ 'override LCLDIR=$(s','ubst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+
'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
'ifeq ($(LCLDIR),)'#010+ 'ifeq ($(LCLDIR),)'#010+
'override LCLDIR=wrong'#010+ 'override LCLDIR=wrong'#010+
@ -2271,21 +2271,21 @@ const fpcmakeini : array[0..212,1..240] of char=(
'endif'#010+ 'endif'#010+
#010+ #010+
'# Generate dirs'#010+ '# Generate dirs'#010+
'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL','_PLATFORM) $(LC'+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LC','L_PLATFORM) $(LC'+
'LDIR)/units)'#010+ 'LDIR)/units)'#010+
'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
'nts $(LCLDIR)/components)'#010+ 'nts $(LCLDIR)/components)'#010+
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
#010+ #010+
'# Add LCL dirs to paths'#010+ '# Add LCL dirs to paths'#010+
'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010,
'o','verride COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
#010+ #010+
'[lclinforules]'#010+ '[lclinforules]'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'# LCL Info rules'#010+ '# LCL Info rules'#010+
'#####################################################################'#010+ '#####################################################################'#010+
'override INFORULES+=lclinfo',#010+ 'override INFORULES+=lclinf','o'#010+
#010+ #010+
'.PHONY: lclinfo'#010+ '.PHONY: lclinfo'#010+
#010+ #010+
@ -2295,6 +2295,6 @@ const fpcmakeini : array[0..212,1..240] of char=(
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
' ',' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' ',' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
' @$(ECHO)'#010 ' @$(ECHO)'#010
); );

View File

@ -1305,7 +1305,7 @@ ifeq ($(CPU_TARGET),powerpc)
FPCCPUOPT:=-O1r FPCCPUOPT:=-O1r
endif endif
else else
FPCCPUOPT:=-O2 FPCCPUOPT:=-O1r
endif endif
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE override FPCOPTDEF+=RELEASE