From 2fae257a575b65a18db0dfc58043d111e21a81ce Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 20 Sep 2000 19:44:06 +0000 Subject: [PATCH] * ppos2 removed --- utils/fpcmake.inc | 514 +++++++++++++++++++++++----------------------- 1 file changed, 257 insertions(+), 257 deletions(-) diff --git a/utils/fpcmake.inc b/utils/fpcmake.inc index 0e27410597..bc80069606 100644 --- a/utils/fpcmake.inc +++ b/utils/fpcmake.inc @@ -85,17 +85,13 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifdef PP'#010+ 'FPC=$(PP)'#010+ 'else'#010+ - 'ifdef inOS2'#010+ - 'FPC=ppos2'#010+ - 'else'#010+ 'FPC=ppc386'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ 'override FPC:=$(subst $(SRCEXEEXT),,$(FPC))'#010+ - 'override FPC:=$(subst \,','/,$(FPC))$(SRCEXEEXT)'#010+ + 'override FPC:=$(subst \,/,$(FPC))$(SRCEXEEXT)'#010+ #010+ - '# Target OS'#010+ + '# Target O','S'#010+ 'ifndef OS_TARGET'#010+ 'OS_TARGET:=$(shell $(FPC) -iTO)'#010+ 'endif'#010+ @@ -110,9 +106,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'CPU_TARGET:=$(shell $(FPC) -iTP)'#010+ 'endif'#010+ #010+ - '# Source C','PU'#010+ + '# Source CPU'#010+ 'ifndef CPU_SOURCE'#010+ - 'CPU_SOURCE:=$(shell $(FPC) -iSP)'#010+ + 'CPU_SOURCE:=','$(shell $(FPC) -iSP)'#010+ 'endif'#010+ #010+ '# FPC version'#010+ @@ -124,7 +120,7 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ #010+ '[fpcdircheckenv]'#010+ - '######################','##############################################'+ + '#######################################################','#############'+ '#'#010+ '# FPCDIR Setting'#010+ '#####################################################################'#010+ @@ -132,8 +128,8 @@ const fpcmakeini : array[0..134,1..240] of char=( '# Test FPCDIR to look if the RTL dir exists'#010+ 'ifdef FPCDIR'#010+ 'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+ - 'ifeq ($','(wildcard $(FPCDIR)/rtl),)'#010+ - 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ + 'ifeq ($(wildcard $(FPCDIR)/rtl),)'#010+ + 'ifeq (','$(wildcard $(FPCDIR)/units),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -145,16 +141,16 @@ const fpcmakeini : array[0..134,1..240] of char=( '# Detect FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ 'ifdef inUnix'#010+ - 'override FPCDIR=/usr/local/lib/fpc/$(FPC_V','ERSION)'#010+ - 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ + 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ + 'ifeq ($(wildcard $(FPCDIR',')/units),)'#010+ 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(add'+ 'suffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ - 'ifeq ($','(wildcard $(FPCDIR)/rtl),)'#010+ - 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ + 'ifeq ($(wildcard $(FPCDIR)/rtl),)'#010+ + 'ifeq (','$(wildcard $(FPCDIR)/units),)'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(FPCDIR)/rtl),)'#010+ 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ @@ -167,8 +163,8 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ '[fpcdirsubs]'#010+ - '# Cre','ate units dir'#010+ - 'ifneq ($(FPCDIR),.)'#010+ + '# Create units dir'#010+ + 'ifneq ($(FPCDIR),.)',#010+ 'UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)'#010+ 'endif'#010+ #010+ @@ -178,9 +174,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'UNITSDIR='#010+ 'endif'#010+ 'ifeq ($(wildcard $(TOOLKITSDIR)),)'#010+ - 'TOOLKITS','DIR='#010+ + 'TOOLKITSDIR='#010+ 'endif'#010+ - 'ifeq ($(wildcard $(PACKAGESDIR)),)'#010+ + 'ifeq ($(wildcard $(PAC','KAGESDIR)),)'#010+ 'PACKAGESDIR='#010+ 'endif'#010+ 'ifeq ($(wildcard $(COMPONENTSDIR)),)'#010+ @@ -191,7 +187,7 @@ const fpcmakeini : array[0..134,1..240] of char=( '[presettings]'#010+ '#####################################################################'#010+ '# Pre Settings'#010+ - '################','####################################################'+ + '#################################################','###################'+ '#'#010+ #010+ #010+ @@ -201,25 +197,26 @@ const fpcmakeini : array[0..134,1..240] of char=( '#####################################################################'#010+ #010+ #010+ - '[postsettin','gs]'#010+ - '#####################################################################'#010+ + '[postsettings]'#010+ + '#############################','#######################################'+ + '#'#010+ '# Post Settings'#010+ '#####################################################################'#010+ #010+ #010+ '[shelltools]'#010+ - '#################################################################','###'+ - '#'#010+ - '# Shell tools'#010+ '#####################################################################'#010+ + '# Shell tools'#010+ + '##############','######################################################'+ + '#'#010+ #010+ '# echo'#010+ 'ifndef ECHO'#010+ 'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))'#010+ 'ifeq ($(ECHO),)'#010+ - 'ECHO:=$(strip $(wildcard $(addsuffix /echo$(S','RCEXEEXT),$(SEARCHPATH)'+ - ')))'#010+ - 'ifeq ($(ECHO),)'#010+ + 'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))'+ + ')'#010+ + 'ifeq (','$(ECHO),)'#010+ 'ECHO:=echo'#010+ 'ECHOE:=echo'#010+ 'else'#010+ @@ -237,9 +234,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'COPY:=cp -fp'#010+ 'endif'#010+ #010+ - '# Copy ','a whole tree'#010+ + '# Copy a whole tree'#010+ 'ifndef COPYTREE'#010+ - 'COPYTREE:=cp -rfp'#010+ + 'COPY','TREE:=cp -rfp'#010+ 'endif'#010+ #010+ '# To move pograms'#010+ @@ -258,9 +255,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ '# To install files'#010+ - 'ifnd','ef INSTALL'#010+ + 'ifndef INSTALL'#010+ 'ifdef inUnix'#010+ - 'INSTALL:=install -m 644'#010+ + 'INSTALL:=','install -m 644'#010+ 'else'#010+ 'INSTALL:=$(COPY)'#010+ 'endif'#010+ @@ -277,8 +274,8 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '# To make a directory.'#010+ 'ifndef MKDIR'#010+ - 'ifd','ef inUnix'#010+ - 'MKDIR:=install -m 755 -d'#010+ + 'ifdef inUnix'#010+ + 'MKDIR:=install -m 755 -','d'#010+ 'else'#010+ 'MKDIR:=ginstall -m 755 -d'#010+ 'endif'#010+ @@ -289,9 +286,10 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ #010+ '[tool_default]'#010+ - '#####################################################################'#010, - '# Default Tools'#010+ '#####################################################################'#010+ + '# Default Tools'#010+ + '#################','###################################################'+ + '#'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ 'ifndef AS'#010+ @@ -304,10 +302,10 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ '# ppas.bat / ppas.sh'#010+ - 'ifdef inUn','ix'#010+ + 'ifdef inUnix'#010+ 'PPAS=ppas.sh'#010+ 'else'#010+ - 'ifdef inOS2'#010+ + 'ifdef inOS2'#010, 'PPAS=ppas.cmd'#010+ 'else'#010+ 'PPAS=ppas.bat'#010+ @@ -324,9 +322,9 @@ const fpcmakeini : array[0..134,1..240] of char=( '[tool_ppdep]'#010+ '# ppdep'#010+ 'ifndef PPDEP'#010+ - 'PPDEP:=$(strip $(wildcard $(addsuffix /ppd','ep$(SRCEXEEXT),$(SEARCHPAT'+ - 'H))))'#010+ - 'ifeq ($(PPDEP),)'#010+ + 'PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(SRCEXEEXT),$(SEARCHPATH)'+ + ')))'#010+ + 'i','feq ($(PPDEP),)'#010+ 'PPDEP='#010+ 'else'#010+ 'PPDEP:=$(firstword $(PPDEP))'#010+ @@ -339,10 +337,10 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifndef PPUMOVE'#010+ 'PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHP'+ 'ATH))))'#010+ - 'ifeq (','$(PPUMOVE),)'#010+ + 'ifeq ($(PPUMOVE),)'#010+ 'PPUMOVE='#010+ 'else'#010+ - 'PPUMOVE:=$(firstword $(PPUMOVE))'#010+ + 'PPUMOV','E:=$(firstword $(PPUMOVE))'#010+ 'endif'#010+ 'endif'#010+ 'export PPUMOVE'#010+ @@ -353,9 +351,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(SRCEXEEXT),$(SEARC'+ 'HPATH))))'#010+ 'ifeq ($(PPUFILES),)'#010+ - 'PPUFILES=',#010+ + 'PPUFILES='#010+ 'else'#010+ - 'PPUFILES:=$(firstword $(PPUFILES))'#010+ + 'PPUFILES:=$(firstword $(PPU','FILES))'#010+ 'endif'#010+ 'endif'#010+ 'export PPUFILES'#010+ @@ -368,9 +366,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifeq ($(DATA2INC),)'#010+ 'DATA2INC='#010+ 'else'#010+ - 'DATA2INC:=$(','firstword $(DATA2INC))'#010+ - 'endif'#010+ + 'DATA2INC:=$(firstword $(DATA2INC))'#010+ 'endif'#010+ + 'endi','f'#010+ 'export DATA2INC'#010+ #010+ '[tool_diff]'#010+ @@ -386,10 +384,11 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ 'export DIFF'#010+ #010+ - '[tool_','cmp]'#010+ + '[tool_cmp]'#010+ '# cmp'#010+ 'ifndef CMP'#010+ - 'CMP:=$(strip $(wildcard $(addsuffix /cmp$(SRCEXEEXT),$(SEARCHPATH))))'#010+ + 'CMP:=$(stri','p $(wildcard $(addsuffix /cmp$(SRCEXEEXT),$(SEARCHPATH)))'+ + ')'#010+ 'ifeq ($(CMP),)'#010+ 'CMP='#010+ 'else'#010+ @@ -401,9 +400,8 @@ const fpcmakeini : array[0..134,1..240] of char=( '[tool_sed]'#010+ '# Sed'#010+ 'ifndef SED'#010+ - 'SED:=$(strip $(wildcard $(addsuffix /sed$(SRCE','XEEXT),$(SEARCHPATH)))'+ - ')'#010+ - 'ifeq ($(SED),)'#010+ + 'SED:=$(strip $(wildcard $(addsuffix /sed$(SRCEXEEXT),$(SEARCHPATH))))'#010+ + 'ifeq ($(S','ED),)'#010+ 'SED='#010+ 'else'#010+ 'SED:=$(firstword $(SED))'#010+ @@ -416,10 +414,10 @@ const fpcmakeini : array[0..134,1..240] of char=( 'uase'#010+ '# upx uses that one itself (PFV)'#010+ 'ifndef UPXPROG'#010+ - 'ifeq ($(OS_T','ARGET),go32v2)'#010+ + 'ifeq ($(OS_TARGET),go32v2)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ - 'ifeq ($(OS_TARGET),win32)'#010+ + 'i','feq ($(OS_TARGET),win32)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ 'ifdef UPXPROG'#010+ @@ -430,11 +428,11 @@ const fpcmakeini : array[0..134,1..240] of char=( 'else'#010+ 'UPXPROG:=$(firstword $(UPXPROG))'#010+ 'endif'#010+ - 'else'#010, + 'else'#010+ 'UPXPROG='#010+ 'endif'#010+ 'endif'#010+ - 'export UPXPROG'#010+ + 'export UPXPR','OG'#010+ #010+ '[tool_date]'#010+ '# gdate/date'#010+ @@ -444,10 +442,10 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifeq ($(DATE),)'#010+ 'DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEACHPATH)))'+ ')'#010+ - 'ifeq (','$(DATE),)'#010+ + 'ifeq ($(DATE),)'#010+ 'DATE='#010+ 'else'#010+ - 'DATE:=$(firstword $(DATE))'#010+ + 'DATE:=$(firs','tword $(DATE))'#010+ 'endif'#010+ 'else'#010+ 'DATE:=$(firstword $(DATE))'#010+ @@ -463,9 +461,9 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '[tool_zip]'#010+ '# ZipProg, you can'#039't use Zip as the var name (PFV)'#010+ - 'i','fndef ZIPPROG'#010+ - 'ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH)'+ - ')))'#010+ + 'ifndef ZIPPROG'#010+ + 'ZIPPROG:=$(strip $(','wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPAT'+ + 'H))))'#010+ 'ifeq ($(ZIPPROG),)'#010+ 'ZIPPROG='#010+ 'else'#010+ @@ -480,7 +478,7 @@ const fpcmakeini : array[0..134,1..240] of char=( '[tool_tar]'#010+ '# Tar'#010+ 'ifndef TARPROG'#010+ - 'TAR','PROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPAT'+ + 'TARPROG:=$(strip $(wildcard $(addsuf','fix /tar$(SRCEXEEXT),$(SEARCHPAT'+ 'H))))'#010+ 'ifeq ($(TARPROG),)'#010+ 'TARPROG='#010+ @@ -495,20 +493,21 @@ const fpcmakeini : array[0..134,1..240] of char=( 'TAREXT=.tar.bz2'#010+ 'else'#010+ 'TAROPT=vz'#010+ - 'TAREXT=.tar.g','z'#010+ + 'TAREXT=.tar.gz'#010+ 'endif'#010+ #010+ #010+ '[extensions]'#010+ - '#####################################################################'#010+ + '##########','##########################################################'+ + '#'#010+ '# Default extensions'#010+ '#####################################################################'#010+ #010+ '# Default needed extensions (Go32v2,Linux)'#010+ - 'LOADEREXT=.a','s'#010+ + 'LOADEREXT=.as'#010+ 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ - 'PPUEXT=.ppu'#010+ + 'PPUEXT=','.ppu'#010+ 'OEXT=.o'#010+ 'ASMEXT=.s'#010+ 'SMARTEXT=.sl'#010+ @@ -524,9 +523,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ASMEXT=.s1'#010+ 'SMARTEXT=.sl1'#010+ 'STATICLIBEXT=.a1'#010+ - 'SHAREDLIBE','XT=.so1'#010+ + 'SHAREDLIBEXT=.so1'#010+ 'FPCMADE=fpcmade.v1'#010+ - 'endif'#010+ + 'endif'#010, #010+ '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ @@ -543,11 +542,11 @@ const fpcmakeini : array[0..134,1..240] of char=( '# Linux'#010+ 'ifeq ($(OS_TARGET),freebsd)'#010+ 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010, + 'HASSHAREDLIB=1'#010+ 'FPCMADE=fpcmade.freebsd'#010+ 'endif'#010+ #010+ - '# Win32'#010+ + '# ','Win32'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ 'PPUEXT=.ppw'#010+ 'OEXT=.ow'#010+ @@ -563,9 +562,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'PPUEXT=.ppo'#010+ 'ASMEXT=.so2'#010+ 'OEXT=.oo2'#010+ - 'SM','ARTEXT=.so'#010+ + 'SMARTEXT=.so'#010+ 'STATICLIBEXT=.ao2'#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'SHAR','EDLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.os2'#010+ 'endif'#010+ #010+ @@ -579,29 +578,29 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ '# determine which .pas extension is used'#010+ - 'ifnde','f PASEXT'#010+ + 'ifndef PASEXT'#010+ 'ifdef EXEOBJECTS'#010+ - 'override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(EX'+ - 'EOBJECTS)))))'#010+ + 'overrid','e TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $('+ + 'EXEOBJECTS)))))'#010+ 'else'#010+ 'override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(UN'+ 'ITOBJECTS)))))'#010+ 'endif'#010+ 'ifeq ($(TESTPAS),)'#010+ 'PASEXT=.pp'#010+ - 'else',#010+ + 'else'#010+ 'PASEXT=.pas'#010+ 'endif'#010+ 'endif'#010+ #010+ #010+ - '[dir_default]'#010+ + '[dir_d','efault]'#010+ '#####################################################################'#010+ '# Default Directories'#010+ '#####################################################################'#010+ #010+ - '# Linux and freebsd use unix dirs wi','th /usr/bin, /usr/lib'#010+ - 'ifeq ($(OS_TARGET),linux)'#010+ + '# Linux and freebsd use unix dirs with /usr/bin, /usr/lib'#010+ + 'ifeq ($(OS_','TARGET),linux)'#010+ 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),freebsd)'#010+ @@ -611,10 +610,10 @@ const fpcmakeini : array[0..134,1..240] of char=( '# set the prefix directory where to install everything'#010+ 'ifndef PREFIXINSTALLDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ - 'PREFIXINSTALLDIR=','/usr'#010+ + 'PREFIXINSTALLDIR=/usr'#010+ 'else'#010+ 'PREFIXINSTALLDIR=/pp'#010+ - 'endif'#010+ + 'en','dif'#010+ 'endif'#010+ 'export PREFIXINSTALLDIR'#010+ #010+ @@ -626,17 +625,16 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ #010+ '[dir_install]'#010+ - '##################################################','##################'+ - '#'#010+ - '# Install Directories'#010+ + '#####################################################################'#010+ + '# Install Dir','ectories'#010+ '#####################################################################'#010+ #010+ '# set the base directory where to install everything'#010+ 'ifndef BASEINSTALLDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ - 'BASEINSTALLDIR=$(PREFIXINSTALLD','IR)/lib/fpc/$(FPC_VERSION)'#010+ + 'BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ - 'BASEINSTALLDIR=$(PREFIXINSTALLDIR)'#010+ + 'B','ASEINSTALLDIR=$(PREFIXINSTALLDIR)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -645,9 +643,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifdef UNIXINSTALLDIR'#010+ 'BININSTALLDIR=$(PREFIXINSTALLDIR)/bin'#010+ 'else'#010+ - 'BININSTALLDIR=$(BASEINSTA','LLDIR)/bin/$(OS_TARGET)'#010+ - 'endif'#010+ + 'BININSTALLDIR=$(BASEINSTALLDIR)/bin/$(OS_TARGET)'#010+ 'endif'#010+ + 'end','if'#010+ #010+ '# set the directory where to install the units.'#010+ 'ifndef UNITINSTALLDIR'#010+ @@ -657,7 +655,7 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# W','here to install shared libraries'#010+ + '# Where to install shared libraries'#010, 'ifndef LIBINSTALLDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'LIBINSTALLDIR=$(PREFIXINSTALLDIR)/lib'#010+ @@ -668,8 +666,8 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '# Where the source files will be stored'#010+ 'ifndef SOURCEINSTALLDIR'#010+ - 'ifdef UNIXINS','TALLDIR'#010+ - 'SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)'#010+ + 'ifdef UNIXINSTALLDIR'#010+ + 'SOURCEINSTALLDIR=$(PREFIX','INSTALLDIR)/src/fpc-$(FPC_VERSION)'#010+ 'else'#010+ 'SOURCEINSTALLDIR=$(BASEINSTALLDIR)/source'#010+ 'endif'#010+ @@ -678,9 +676,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the doc files will be sto','red'#010+ + '# Where the doc files will be stored'#010+ 'ifndef DOCINSTALLDIR'#010+ - 'ifdef UNIXINSTALLDIR'#010+ + 'ifdef UN','IXINSTALLDIR'#010+ 'DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(FPC_VERSION)'#010+ 'else'#010+ 'DOCINSTALLDIR=$(BASEINSTALLDIR)/doc'#010+ @@ -688,7 +686,7 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ '# Where to install the examples, under linux we use the doc dir'#010+ - '# because the copyt','ree command will create a subdir itself'#010+ + '# because the copytree command will create a subdir ','itself'#010+ 'ifndef EXAMPLEINSTALLDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'EXAMPLEINSTALLDIR=$(DOCINSTALLDIR)/examples'#010+ @@ -696,9 +694,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'EXAMPLEINSTALLDIR=$(BASEINSTALLDIR)/examples'#010+ 'endif'#010+ 'ifdef EXAMPLESUBDIR'#010+ - 'EXAMPLEINSTALLDIR:=$(EXAMPLEINSTAL','LDIR)/$(EXAMPLESUBDIR)'#010+ - 'endif'#010+ + 'EXAMPLEINSTALLDIR:=$(EXAMPLEINSTALLDIR)/$(EXAMPLESUBDIR)'#010+ 'endif'#010+ + 'endi','f'#010+ #010+ '# Where the some extra (data)files will be stored'#010+ 'ifndef DATAINSTALLDIR'#010+ @@ -710,7 +708,7 @@ const fpcmakeini : array[0..134,1..240] of char=( '# On linux, try to find where libgcc.a is.'#010+ 'ifdef inUnix'#010+ 'ifndef GCCLIBDIR'#010+ - 'GCCLI','BDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{ pri'+ + 'GCCLIBDIR:=$(shell dirname `(gcc -v 2>','&1)| head -n 1| awk '#039'{ pri'+ 'nt $$4 } '#039'`)'#010+ 'endif'#010+ 'endif'#010+ @@ -721,10 +719,10 @@ const fpcmakeini : array[0..134,1..240] of char=( '# Where to find other libraries'#010+ 'ifdef inUnix'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039,'{ ORS="'+ - ' "; print $1 }'#039')'#010+ - 'endif'#010+ + 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ + '"; print $1 }'#039')'#010+ 'endif'#010+ + 'end','if'#010+ 'export OTHERLIBDIR'#010+ #010+ #010+ @@ -734,11 +732,11 @@ const fpcmakeini : array[0..134,1..240] of char=( '#####################################################################'#010+ #010+ 'ifndef REDIRFILE'#010+ - 'RED','IRFILE=log'#010+ + 'REDIRFILE=log'#010+ 'endif'#010+ #010+ 'ifdef REDIR'#010+ - 'ifndef inUnix'#010+ + 'ifn','def inUnix'#010+ 'override FPC=redir -eo $(FPC)'#010+ 'endif'#010+ '# set the verbosity to max'#010+ @@ -747,16 +745,15 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ '[command_begin]'#010+ - '########################################################','############'+ - '#'#010+ - '# Compiler Command Line'#010+ + '#####################################################################'#010+ + '# Compiler Command ','Line'#010+ '#####################################################################'#010+ #010+ '# Load commandline OPTDEF and add FPC_CPU define'#010+ 'override FPCOPTDEF:=-d$(CPU_TARGET)'#010+ #010+ - '# Load commandline OPT and add target and uni','t dir to be sure'#010+ - 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ + '# Load commandline OPT and add target and unit dir to be sure'#010+ + 'ifneq ($(OS_TARG','ET),$(OS_SOURCE))'#010+ 'override FPCOPT+=-T$(OS_TARGET)'#010+ 'endif'#010+ #010+ @@ -765,8 +762,8 @@ const fpcmakeini : array[0..134,1..240] of char=( 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ - 'override FPCOPT','+=$(addprefix -Fl,$(LIBDIR))'#010+ - 'endif'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ + 'endi','f'#010+ 'ifdef OBJDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ @@ -779,9 +776,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'override FPCOPT+=-XX'#010+ 'endif'#010+ #010+ - '# Smartlinking crea','tion'#010+ + '# Smartlinking creation'#010+ 'ifdef CREATESMART'#010+ - 'override FPCOPT+=-CX'#010+ + 'override F','PCOPT+=-CX'#010+ 'endif'#010+ #010+ '# Debug'#010+ @@ -791,8 +788,8 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+ '# 0.99.12b has a bug in the optimizer so don'#039't use it by default'#010+ - 'ifdef RELE','ASE'#010+ - 'ifeq ($(FPC_VERSION),0.99.12)'#010+ + 'ifdef RELEASE'#010+ + 'ifeq ($(FPC_VERSION),0.99.12)',#010+ 'override FPCOPT+=-Xs -OGp3 -n'#010+ 'else'#010+ 'override FPCOPT+=-Xs -OG2p3 -n'#010+ @@ -809,9 +806,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'override FPCOPT+=-OG2p3'#010+ 'endif'#010+ #010+ - '# Verbose settings (w','arning,note,info)'#010+ + '# Verbose settings (warning,note,info)'#010+ 'ifdef VERBOSE'#010+ - 'override FPCOPT+=-vwni'#010+ + 'o','verride FPCOPT+=-vwni'#010+ 'endif'#010+ #010+ #010+ @@ -827,9 +824,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ #010+ - '[command_unitsd','ir]'#010+ + '[command_unitsdir]'#010+ 'ifdef UNITSDIR'#010+ - 'override FPCOPT+=-Fu$(UNITSDIR)'#010+ + 'override FPCOP','T+=-Fu$(UNITSDIR)'#010+ 'endif'#010+ #010+ #010+ @@ -843,10 +840,10 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifdef NEEDOBJDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(NEEDOBJDIR))'#010+ 'endif'#010+ - #010, + #010+ #010+ '[command_needinc]'#010+ - 'ifdef NEEDINCDIR'#010+ + 'ifdef NEEDINCD','IR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))'#010+ 'endif'#010+ #010+ @@ -857,9 +854,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ '[command_otherlib]'#010+ - '# Add Other dirs path if aske','d'#010+ + '# Add Other dirs path if asked'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ + 'override FPCO','PT+=$(addprefix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ '[command_target]'#010+ @@ -867,9 +864,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifdef TARGETDIR'#010+ 'override FPCOPT+=-FE$(TARGETDIR)'#010+ 'ifeq ($(TARGETDIR),.)'#010+ - 'override TARGETDIRPREF','IX='#010+ + 'override TARGETDIRPREFIX='#010+ 'else'#010+ - 'override TARGETDIRPREFIX=$(TARGETDIR)/'#010+ + 'override TARGETDIRPREFIX','=$(TARGETDIR)/'#010+ 'endif'#010+ 'endif'#010+ 'ifdef UNITTARGETDIR'#010+ @@ -880,8 +877,8 @@ const fpcmakeini : array[0..134,1..240] of char=( 'override UNITTARGETDIRPREFIX=$(TARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ - 'ifdef TA','RGETDIR'#010+ - 'override UNITTARGETDIR=$(TARGETDIR)'#010+ + 'ifdef TARGETDIR'#010+ + 'override UNITTARGETDIR=$(','TARGETDIR)'#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ @@ -892,9 +889,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ #010+ - '# Add defines from FPCOPTDEF',' to FPCOPT'#010+ + '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ - 'override FPCOPT+=$(FPCOPTDEF)'#010+ + 'overri','de FPCOPT+=$(FPCOPTDEF)'#010+ 'endif'#010+ #010+ '# Error file ?'#010+ @@ -909,15 +906,15 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ #010+ '[command_win32file]'#010+ - '# ','For win32 the options are passed using the file fpcext.cmd'#010+ + '# For win32 the options are passed ','using the file fpcext.cmd'#010+ 'ifndef FPCEXTFILE'#010+ 'FPCEXTFILE=fpcext.cmd'#010+ 'endif'#010+ 'ifeq ($(OS_SOURCE),win32)'#010+ 'override TMPVAR:=$(shell "$(DEL) $(FPCEXTFILE)")'#010+ - 'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(','A)" >> $'+ - '(FPCEXTFILE)"))'#010+ - 'override FPCOPT:=@$(FPCEXTFILE)'#010+ + 'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $(F'+ + 'PCEXTFILE)"))'#010+ + 'override ','FPCOPT:=@$(FPCEXTFILE)'#010+ 'endif'#010+ #010+ '[command_win32env]'#010+ @@ -925,10 +922,10 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifeq ($(OS_SOURCE),win32)'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ - 'export ','FPCEXTCMD'#010+ + 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ - '[command_compiler]'#010+ + '[command_compile','r]'#010+ '# Compiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ @@ -936,8 +933,8 @@ const fpcmakeini : array[0..134,1..240] of char=( '# but only if the OS_SOURCE and OS_TARGE are equal'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ - 'el','se'#010+ - 'ifeq ($(OS_SOURCE),$(OS_TARGET))'#010+ + 'else'#010+ + 'ifeq ($(OS_SOURCE),$(OS_TARGET','))'#010+ 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ 'endif'#010+ @@ -946,19 +943,18 @@ const fpcmakeini : array[0..134,1..240] of char=( '[standardrules]'#010+ '#####################################################################'#010+ '# Standard rules'#010+ - '####################################################################','#'+ - #010+ + '#####################################################################'#010+ #010+ '[packagedependrules]'#010+ - '#####################################################################'#010+ + '#########','###########################################################'+ + '#'#010+ '# Package depends'#010+ '#####################################################################'#010+ #010+ #010+ '[loaderrules]'#010+ - '##########################################','##########################'+ - '#'#010+ - '# Loaders'#010+ + '#####################################################################'#010+ + '# Loa','ders'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ @@ -967,8 +963,8 @@ const fpcmakeini : array[0..134,1..240] of char=( ' $(AS) -o $*$(OEXT) $<'#010+ #010+ 'override ALLTARGET+=fpc_loaders'#010+ - 'override CLEANTARGET+=f','pc_loaders_clean'#010+ - 'override SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+ + 'override CLEANTARGET+=fpc_loaders_clean'#010+ + 'override SHOWINS','TALLTARGET+=fpc_loaders_showinstall'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+ @@ -976,9 +972,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'fpc_loaders: $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ - ' -$(DEL)',' $(LOADEROFILES)'#010+ + ' -$(DEL) $(LOADEROFILES)'#010+ #010+ - 'fpc_loaders_showinstall:'#010+ + 'fpc_loaders_sho','winstall:'#010+ ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)'+ ')'#010+ #010+ @@ -988,7 +984,7 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ #010+ '[unitrules]'#010+ - '#','###################################################################'+ + '##################################','##################################'+ '#'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -997,8 +993,8 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT','),$(UNITOBJECTS))'#010+ - 'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+ + 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))'#010+ + 'override INSTAL','LPPUFILES+=$(UNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+ #010+ 'fpc_units: $(UNITPPUFILES)'#010+ @@ -1008,7 +1004,7 @@ const fpcmakeini : array[0..134,1..240] of char=( '[exerules]'#010+ '#####################################################################'#010+ '# Exes'#010+ - '#####################','###############################################'+ + '######################################################','##############'+ '#'#010+ #010+ '.PHONY: fpc_exes'#010+ @@ -1018,8 +1014,8 @@ const fpcmakeini : array[0..134,1..240] of char=( 'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ - 'override INSTALL','EXEFILES+=$(EXEFILES)'#010+ - 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ + 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ + 'override CL','EANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'endif'#010+ #010+ 'fpc_exes: $(EXEFILES)'#010+ @@ -1028,9 +1024,8 @@ const fpcmakeini : array[0..134,1..240] of char=( '[rstrules]'#010+ '#####################################################################'#010+ '# Resource strings'#010+ - '######################################','##############################'+ - '#'#010+ - #010+ + '#####################################################################'#010+ + #010, 'ifdef RSTOBJECTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))'#010+ #010+ @@ -1040,15 +1035,16 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '[examplerules]'#010+ '#####################################################################'#010+ - '# Exa','mples'#010+ - '#####################################################################'#010+ + '# Examples'#010+ + '###########################','#########################################'+ + '#'#010+ #010+ '.PHONY: fpc_examples fpc_test'#010+ #010+ 'ifdef EXAMPLEOBJECTS'#010+ 'override EXAMPLESOURCEFILES:=$(addsuffix $(PASEXT),$(EXAMPLEOBJECTS))'#010+ - 'override EXAMPLEFILES:=$(addsuffix $(EXEE','XT),$(EXAMPLEOBJECTS))'#010+ - 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+ + 'override E','XAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'endif'#010+ @@ -1056,18 +1052,19 @@ const fpcmakeini : array[0..134,1..240] of char=( 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(EXAMPLEDIROBJECTS'+ '))'#010+ #010+ - 'fpc_test: examp','les'#010+ + 'fpc_test: examples'#010+ #010+ #010+ '[compilerules]'#010+ - '#####################################################################'#010+ + '############','########################################################'+ + '#'#010+ '# General compile rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_packages fpc_all fpc_debug'#010+ #010+ - '$(FPCMADE): $(','ALLTARGET)'#010+ - ' @$(ECHO) Compiled > $(FPCMADE)'#010+ + '$(FPCMADE): $(ALLTARGET)'#010+ + ' @$(ECHO) Compi','led > $(FPCMADE)'#010+ #010+ 'fpc_packages: $(COMPILEPACKAGES)'#010+ #010+ @@ -1078,10 +1075,10 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '# Search paths for .ppu if targetdir is set'#010+ 'ifdef UNITTARGETDIR'#010+ - 'vpath %$(PPUEXT) ','$(UNITTARGETDIR)'#010+ + 'vpath %$(PPUEXT) $(UNITTARGETDIR)'#010+ 'endif'#010+ #010+ - '# General compile rules, available for both possible PASEXT'#010+ + '# General',' compile rules, available for both possible PASEXT'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+ #010+ @@ -1090,8 +1087,8 @@ const fpcmakeini : array[0..134,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ - ' $(COMPILER',') $< $(REDIR)'#010+ - ' $(EXECPPAS)'#010+ + ' $(COMPILER) $< $(REDIR)'#010+ + ' $(EXECPPAS)',#010+ #010+ '%$(EXEEXT): %.pp'#010+ ' $(COMPILER) $< $(REDIR)'#010+ @@ -1103,10 +1100,10 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ #010+ '[libraryrules]'#010+ - '################################################','####################'+ - '#'#010+ - '# Library'#010+ '#####################################################################'#010+ + '# Library'#010+ + '#','###################################################################'+ + '#'#010+ #010+ '.PHONY: fpc_smart fpc_shared'#010+ #010+ @@ -1116,8 +1113,8 @@ const fpcmakeini : array[0..134,1..240] of char=( 'LIBFULLNAME=$(LIBNAME)'#010+ 'endif'#010+ #010+ - '# Default sharedli','b units are all unit objects'#010+ - 'ifndef SHAREDLIBUNITOBJECTS'#010+ + '# Default sharedlib units are all unit objects'#010+ + 'ifnd','ef SHAREDLIBUNITOBJECTS'#010+ 'SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+ 'endif'#010+ #010+ @@ -1127,9 +1124,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'fpc_shared: all'#010+ 'ifdef HASSHAREDLIB'#010+ 'ifndef LIBNAME'#010+ - ' @$(ECHO) "LIBNAME not s','et"'#010+ + ' @$(ECHO) "LIBNAME not set"'#010+ 'else'#010+ - ' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBFULLNAME)'#010+ + ' $(PPUMOVE) $(SHA','REDLIBUNITOBJECTS) -o$(LIBFULLNAME)'#010+ 'endif'#010+ 'else'#010+ ' @$(ECHO) "Shared Libraries not supported"'#010+ @@ -1139,7 +1136,7 @@ const fpcmakeini : array[0..134,1..240] of char=( '[installrules]'#010+ '#####################################################################'#010+ '# Install rules'#010+ - '#','###################################################################'+ + '##################################','##################################'+ '#'#010+ #010+ '.PHONY: fpc_showinstall fpc_install'#010+ @@ -1149,13 +1146,13 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ - 'override I','NSTALLPPUFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLPP'+ + 'override INSTALLPPUFILES:=$(addprefix $(TAR','GETDIRPREFIX),$(INSTALLPP'+ 'UFILES))'#010+ 'ifdef PPUFILES'#010+ 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+ 'else'#010+ 'INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ - 'FILES)) $(addpre','fix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ + 'FILES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT','),$(STATICLIBEXT),$'+ '(INSTALLPPUFILES))))'#010+ 'endif'#010+ 'override INSTALLPPULINKFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALL'+ @@ -1163,9 +1160,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ - 'override INSTALLEXEFILES:=$(addprefix $(TARGETD','IRPREFIX),$(INSTALLEX'+ - 'EFILES))'#010+ - 'endif'#010+ + 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEF'+ + 'ILES))'#010+ + 'end','if'#010+ #010+ 'fpc_showinstall: $(SHOWINSTALLTARGET)'#010+ 'ifdef INSTALLEXEFILES'#010+ @@ -1173,16 +1170,16 @@ const fpcmakeini : array[0..134,1..240] of char=( 'S))'#010+ 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ - ' @$(ECHO) -e $(addprefix "\n"$(UNI','TINSTALLDIR)/,$(INSTALLPPUF'+ - 'ILES))'#010+ + ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+ + 'ES))',#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+ 'KFILES))'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIBFULLNAME)),)'#010+ ' @$(ECHO) $(LIBINSTALLDIR)/$(LIBFULLNAME)'#010+ - 'ifde','f HASSHAREDLIB'#010+ - ' @$(ECHO) $(LIBINSTALLDIR)/$(LIBNAME)'#010+ + 'ifdef HASSHAREDLIB'#010+ + ' @$(ECHO) $','(LIBINSTALLDIR)/$(LIBNAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1192,24 +1189,24 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ #010+ 'fpc_install: $(INSTALLTARGET)'#010+ - '# Create UnitInstallFile','s'#010+ + '# Create UnitInstallFiles'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' $(MKDIR) $(BININSTALLDIR)'#010+ + ' $','(MKDIR) $(BININSTALLDIR)'#010+ '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+ 'endif'#010+ - 'ifdef INSTALLPPUFILES',#010+ - ' $(MKDIR) $(UNITINSTALLDIR)'#010+ + 'ifdef INSTALLPPUFILES'#010+ + ' $(MKDIR) $(UNITINSTALLDI','R)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIBFULLNAME)),)'#010+ - ' $(MKDI','R) $(LIBINSTALLDIR)'#010+ - ' $(INSTALL) $(LIBFULLNAME) $(LIBINSTALLDIR)'#010+ + ' $(MKDIR) $(LIBINSTALLDIR)'#010+ + ' $(INS','TALL) $(LIBFULLNAME) $(LIBINSTALLDIR)'#010+ 'ifdef inUnix'#010+ ' ln -sf $(LIBFULLNAME) $(LIBINSTALLDIR)/$(LIBNAME)'#010+ 'endif'#010+ @@ -1217,7 +1214,7 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ 'ifdef EXTRAINSTALLFILES'#010+ ' $(MKDIR) $(DATAINSTALLDIR)'#010+ - ' $(INSTALL) $(','EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+ + ' $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLD','IR)'#010+ 'endif'#010+ #010+ #010+ @@ -1226,9 +1223,9 @@ const fpcmakeini : array[0..134,1..240] of char=( '# SourceInstall rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc','_sourceinstall'#010+ + '.PHONY: fpc_sourceinstall'#010+ #010+ - 'ifndef SOURCETOPDIR'#010+ + 'ifndef SOURCETOPD','IR'#010+ 'SOURCETOPDIR=$(BASEDIR)'#010+ 'endif'#010+ #010+ @@ -1237,7 +1234,7 @@ const fpcmakeini : array[0..134,1..240] of char=( ' $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)'#010+ #010+ '[exampleinstallrules]'#010+ - '################################','####################################'+ + '#################################################################','###'+ '#'#010+ '# exampleinstall rules'#010+ '#####################################################################'#010+ @@ -1245,16 +1242,16 @@ const fpcmakeini : array[0..134,1..240] of char=( '.PHONY: fpc_exampleinstall'#010+ #010+ 'fpc_exampleinstall: $(addsuffix _clean,$(EXAMPLEDIROBJECTS))'#010+ - 'ifdef EXAMPLESOURCE','FILES'#010+ - ' $(MKDIR) $(EXAMPLEINSTALLDIR)'#010+ + 'ifdef EXAMPLESOURCEFILES'#010+ + ' $(MKDIR) $(EXAMPLEI','NSTALLDIR)'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(EXAMPLEINSTALLDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLEDIROBJECTS'#010+ 'ifndef EXAMPLESOURCEFILES'#010+ ' $(MKDIR) $(EXAMPLEINSTALLDIR)'#010+ 'endif'#010+ - ' $(COPYTREE) $(addsuffix /*,$(','EXAMPLEDIROBJECTS)) $(EXAMPLEIN'+ - 'STALLDIR)'#010+ + ' $(COPYTREE) $(addsuffix /*,$(EXAMPLEDIROBJECTS)) $(EXAMPLEINST', + 'ALLDIR)'#010+ 'endif'#010+ #010+ #010+ @@ -1265,8 +1262,8 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '.PHONY: fpc_zipinstall'#010+ #010+ - '# ','Create suffix to add'#010+ - 'ifndef PACKAGESUFFIX'#010+ + '# Create suffix to add'#010+ + 'ifndef PACKA','GESUFFIX'#010+ 'PACKAGESUFFIX=$(OS_TARGET)'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ 'PACKAGESUFFIX=go32'#010+ @@ -1279,9 +1276,9 @@ const fpcmakeini : array[0..134,1..240] of char=( '# Temporary path to pack a file'#010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ - 'P','ACKDIR=$(BASEDIR)/pack_tmp'#010+ + 'PACKDIR=$(BASEDIR)/pack_tmp'#010+ 'else'#010+ - 'PACKDIR=/tmp/fpc-pack'#010+ + 'P','ACKDIR=/tmp/fpc-pack'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1292,9 +1289,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Use tar by default und','er linux'#010+ + '# Use tar by default under linux'#010+ 'ifndef USEZIP'#010+ - 'ifdef inUnix'#010+ + 'ifdef inUn','ix'#010+ 'USETAR=1'#010+ 'endif'#010+ 'endif'#010+ @@ -1306,13 +1303,13 @@ const fpcmakeini : array[0..134,1..240] of char=( 'else'#010+ ' $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+ 'ifdef USETAR'#010+ - ' $(DEL) $(','DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+ - ' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(Z'+ - 'IPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+ + ' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+ + ' ',' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+ + '(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+ 'else'#010+ ' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ - ' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) ','$(DESTZIPDIR)/$(ZIP'+ - 'NAME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+ + ' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+ + 'ME)$(ZIPEXT)',' * ; cd $(BASEDIR)'#010+ 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ 'endif'#010+ @@ -1322,11 +1319,11 @@ const fpcmakeini : array[0..134,1..240] of char=( '.PHONY: fpc_zipsourceinstall'#010+ #010+ 'fpc_zipsourceinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFI','X'+ - '=src'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=s'+ + 'rc'#010+ #010+ #010+ - '[zipexampleinstallrules]'#010+ + '[zipexampleinstallrules]'#010, '.PHONY: fpc_zipexampleinstall'#010+ #010+ 'fpc_zipexampleinstall:'#010+ @@ -1335,10 +1332,10 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ #010+ '[cleanrules]'#010+ - '###############################################################','#####'+ - '#'#010+ - '# Clean rules'#010+ '#####################################################################'#010+ + '# Clean rules'#010+ + '############','########################################################'+ + '#'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ @@ -1346,14 +1343,14 @@ const fpcmakeini : array[0..134,1..240] of char=( 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+ 'endif'#010+ #010+ - 'ifdef C','LEANPPUFILES'#010+ - 'override CLEANPPUFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANPPUFILES'+ - '))'#010+ + 'ifdef CLEANPPUFILES'#010+ + 'override CLEANPPUFIL','ES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANPPUFIL'+ + 'ES))'#010+ '# Get the .o and .a files created for the units'#010+ 'ifdef PPUFILES'#010+ 'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+ 'else'#010+ - 'CLEANPPULINKFILES:=$(wildcard',' $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFI'+ + 'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEA','NPPUFI'+ 'LES)) $(addprefix $(LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLE'+ 'ANPPUFILES))))'#010+ 'endif'#010+ @@ -1361,9 +1358,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'INKFILES))'#010+ 'endif'#010+ #010+ - 'fpc_clean: $(CLEANTARG','ET)'#010+ + 'fpc_clean: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ - ' -$(DEL) $(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))'#010+ + ' -','$(DEL) $(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ @@ -1371,8 +1368,9 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef CLEANRS','TFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ + 'ifdef CLEANRSTFILES'#010+ + ' -$(DEL) $(addprefi','x $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'+ + #010+ 'endif'#010+ 'ifdef EXTRACLEANFILES'#010+ ' -$(DEL) $(EXTRACLEANFILES)'#010+ @@ -1380,7 +1378,7 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifdef LIBNAME'#010+ ' -$(DEL) $(LIBNAME) $(LIBFULLNAME)'#010+ 'endif'#010+ - ' -$(DEL) $(FPCMADE) $(PPAS',') link.res $(FPCEXTFILE) $(REDIRFIL'+ + ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRF','IL'+ 'E)'#010+ #010+ 'fpc_distclean: fpc_clean'#010+ @@ -1391,14 +1389,14 @@ const fpcmakeini : array[0..134,1..240] of char=( 'TARGETDIRCLEAN=fpc_clean'#010+ 'endif'#010+ #010+ - 'fpc_cl','eanall: $(CLEANTARGET) $(TARGETDIRCLEAN)'#010+ + 'fpc_cleanall: $(CLEANTARGET) $(TARGETDI','RCLEAN)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' ',' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFIL'+ + ' -$(DEL) $(FPCMADE) $(PPAS) li','nk.res $(FPCEXTFILE) $(REDIRFIL'+ 'E)'#010+ #010+ #010+ @@ -1407,10 +1405,10 @@ const fpcmakeini : array[0..134,1..240] of char=( '# Depend rules'#010+ '#####################################################################'#010+ #010+ - '.','PHONY: fpc_depend'#010+ + '.PHONY: fpc_depend'#010+ #010+ 'fpc_depend:'#010+ - ' $(PPDEP) $(UNITOBJECTS)'#010+ + ' ',' $(PPDEP) $(UNITOBJECTS)'#010+ #010+ #010+ '[inforules]'#010+ @@ -1418,7 +1416,7 @@ const fpcmakeini : array[0..134,1..240] of char=( '# Info rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: f','pc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_instal'+ + '.PHONY: fpc_info fpc_cfginfo fpc_objectinf','o fpc_toolsinfo fpc_instal'+ 'linfo \'#010+ ' fpc_dirinfo'#010+ #010+ @@ -1429,8 +1427,8 @@ const fpcmakeini : array[0..134,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) FPC.....','.. $(FPC)'#010+ - ' @$(ECHO) Version... $(FPC_VERSION)'#010+ + ' @$(ECHO) FPC....... $(FPC)'#010+ + ' @$(ECHO) Versi','on... $(FPC_VERSION)'#010+ ' @$(ECHO) CPU....... $(CPU_TARGET)'#010+ ' @$(ECHO) Source.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target.... $(OS_TARGET)'#010+ @@ -1438,8 +1436,8 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '[info_dirs]'#010+ 'fpc_infodirs:'#010+ - ' @$(ECHO',')'#010+ - ' @$(ECHO) == Directory info =='#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) == Directory ','info =='#010+ ' @$(ECHO)'#010+ 'ifdef NEEDGCCLIB'#010+ ' @$(ECHO) GCC library is needed.'#010+ @@ -1448,8 +1446,8 @@ const fpcmakeini : array[0..134,1..240] of char=( ' @$(ECHO) Other library is needed.'#010+ 'endif'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ - ' ',' @$(ECHO)'#010+ - ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ + ' @$(ECHO)'#010+ + ' @$(ECHO) GC','C library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ #010+ @@ -1458,8 +1456,8 @@ const fpcmakeini : array[0..134,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECH','O) Pwd....... $(PWD)'#010+ - ' @$(ECHO) Echo...... $(ECHO)'#010+ + ' @$(ECHO) Pwd....... $(PWD)'#010+ + ' @$(','ECHO) Echo...... $(ECHO)'#010+ 'ifdef PPDEP'#010+ ' @$(ECHO) PPDep..... $(PPDEP)'#010+ 'endif'#010+ @@ -1469,8 +1467,8 @@ const fpcmakeini : array[0..134,1..240] of char=( 'ifdef PPUFILES'#010+ ' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+ 'endif'#010+ - 'ifd','ef DATA2INC'#010+ - ' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+ + 'ifdef DATA2INC'#010+ + ' @$(ECHO) Dat','a2Inc.. $(DATA2INC)'#010+ 'endif'#010+ 'ifdef SED'#010+ ' @$(ECHO) Sed....... $(SED)'#010+ @@ -1482,9 +1480,9 @@ const fpcmakeini : array[0..134,1..240] of char=( ' @$(ECHO) Diff...... $(DIFF)'#010+ 'endif'#010+ 'ifdef CMP'#010+ - ' @$(','ECHO) Cmp....... $(CMP)'#010+ + ' @$(ECHO) Cmp....... $(CMP)'#010+ 'endif'#010+ - 'ifdef UPXPROG'#010+ + 'if','def UPXPROG'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+ 'endif'#010+ 'ifdef ZIPPROG'#010+ @@ -1495,22 +1493,22 @@ const fpcmakeini : array[0..134,1..240] of char=( '[info_objects]'#010+ 'fpc_infoobjects:'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == O','bject info =='#010+ + ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) LoaderObjects..... $(LOADEROBJECTS)'#010+ + ' ',' @$(ECHO) LoaderObjects..... $(LOADEROBJECTS)'#010+ ' @$(ECHO) UnitObjects....... $(UNITOBJECTS)'#010+ ' @$(ECHO) ExeObjects........ $(EXEOBJECTS)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ExtraCleanUnits..','. $(EXTRACLEANUNITS)'#010+ - ' @$(ECHO) ExtraCleanFiles... $(EXTRACLEANFILES)'#010+ + ' @$(ECHO) ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+ + ' @$(E','CHO) ExtraCleanFiles... $(EXTRACLEANFILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+ ' @$(ECHO) ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+ ' @$(ECHO)'#010+ #010+ - '[info_instal','l]'#010+ + '[info_install]'#010+ 'fpc_infoinstall:'#010+ - ' @$(ECHO)'#010+ + ' @$(EC','HO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ 'ifdef DATE'#010+ @@ -1518,34 +1516,35 @@ const fpcmakeini : array[0..134,1..240] of char=( 'endif'#010+ 'ifdef PACKAGEPREFIX'#010+ ' @$(ECHO) PackagePrefix........ $(PACKAGEPREFIX)'#010+ - 'endi','f'#010+ + 'endif'#010+ 'ifdef PACKAGENAME'#010+ - ' @$(ECHO) PackageName.......... $(PACKAGENAME)'#010+ + ' @$(EC','HO) PackageName.......... $(PACKAGENAME)'#010+ 'endif'#010+ ' @$(ECHO) PackageSuffix........ $(PACKAGESUFFIX)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) BaseInstallDir....... $(BASEINSTALLDIR)'#010+ - ' @$(ECHO) BinInstal','lDir........ $(BININSTALLDIR)'#010+ - ' @$(ECHO) LibInstallDir........ $(LIBINSTALLDIR)'#010+ + ' @$(ECHO) BinInstallDir........ $(BININSTALLDIR)'#010+ + ' ',' @$(ECHO) LibInstallDir........ $(LIBINSTALLDIR)'#010+ ' @$(ECHO) UnitInstallDir....... $(UNITINSTALLDIR)'#010+ ' @$(ECHO) SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+ - ' @$(ECHO) DocInstallDir....','.... $(DOCINSTALLDIR)'#010+ - ' @$(ECHO) DataInstallDir....... $(DATAINSTALLDIR)'#010+ + ' @$(ECHO) DocInstallDir........ $(DOCINSTALLDIR)'#010+ + ' @$(','ECHO) DataInstallDir....... $(DATAINSTALLDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[directorytargets]'#010+ - '#','###################################################################'+ + '##################################','##################################'+ '#'#010+ '# Directories'#010+ '#####################################################################'#010+ #010+ '[localmakefile]'#010+ - '#####################################################################'#010, - '# Local Makefile'#010+ '#####################################################################'#010+ + '# Local Makefile'#010+ + '################','####################################################'+ + '#'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ @@ -1553,8 +1552,9 @@ const fpcmakeini : array[0..134,1..240] of char=( #010+ '[userrules]'#010+ '#####################################################################'#010+ - '# Users ru','les'#010+ - '#####################################################################'#010+ + '# Users rules'#010+ + '#############################','#######################################'+ + '#'#010+ #010+ #010+ '[end]'#010