diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 5ad5485d7c..2deec6cd0c 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -56,8 +56,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ 'else'#010+ - 'ifneq ($(findstring cygwin,$(MACHTYPE)),)'#010+ - 'inCygW','in=1'#010+ + 'ifneq ($(findstring cygdrive,$(PATH)),)'#010+ + 'inCygWin','=1'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -66,7 +66,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Note that maybe Linux Slackware users would also like this, since'#010+ '# Slackwares hierachy is closer to BSD than other unices IIRC.'#010+ #010+ - 'ifeq ($(OS_TARGET),','freebsd)'#010+ + 'ifeq ($(OS_TARGET),fr','eebsd)'#010+ 'BSDhier=1'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),netbsd)'#010+ @@ -85,7 +85,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'else'#010+ 'BATCHEXT=.bat'#010+ 'endif'#010+ - 'endi','f'#010+ + 'endif'#010, #010+ '# Path Separator, the subst trick is necessary for the \ that can'#039't'+ ' exists'#010+ @@ -100,14 +100,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# B','ase dir'#010+ + '# Bas','e dir'#010+ 'ifdef PWD'#010+ 'BASEDIR:=$(subst \,/,$(shell $(PWD)))'#010+ '# For Cygwin we need to replace /cygdrive/c/ with c:/'#010+ 'ifdef inCygWin'#010+ 'ifneq ($(findstring /cygdrive/,$(BASEDIR)),)'#010+ 'BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))'#010+ - 'BASEDRIVE:=$(firstword ','$(subst /, ,$(BASENODIR)))'#010+ + 'BASEDRIVE:=$(firstword $(','subst /, ,$(BASENODIR)))'#010+ 'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))'#010+ 'endif'#010+ 'endif'#010+ @@ -119,7 +119,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ays found'#010+ 'ifdef inOS2'#010+ 'ifndef ECHO'#010+ - 'ECHO:=$(str','ip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH'+ + 'ECHO:=$(strip',' $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH'+ '))))'#010+ 'ifeq ($(ECHO),)'#010+ 'ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH)))'+ @@ -130,7 +130,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ECHO:=$(firstword $(ECHO))'#010+ 'endif'#010+ 'else'#010+ - 'ECHO:=$(firstword $(E','CHO))'#010+ + 'ECHO:=$(firstword $(ECH','O))'#010+ 'endif'#010+ 'endif'#010+ 'export ECHO'#010+ @@ -141,7 +141,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# FPC Binary and Version Detection'#010+ '#####################################################################'#010+ #010+ - '# Compatibility',' with old makefiles'#010+ + '# Compatibility w','ith old makefiles'#010+ 'ifndef FPC'#010+ 'ifdef PP'#010+ 'FPC=$(PP)'#010+ @@ -150,7 +150,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# Try to detect the ppcXXX file to use by using "fpc -PB" option'#010+ '# to query for the default ppcXXX the fpc executable tries. When'#010+ - '# fpc is not found use ppc386 by default. Also ','when fpc -PB gives'#010+ + '# fpc is not found use ppc386 by default. Also wh','en fpc -PB gives'#010+ '# an error ppc386 will be used.'#010+ 'ifndef FPC'#010+ '# check if fpc exists'#010+ @@ -158,15 +158,15 @@ const fpcmakeini : array[0..182,1..240] of char=( ')))'#010+ 'ifneq ($(FPCPROG),)'#010+ 'FPCPROG:=$(firstword $(FPCPROG))'#010+ - 'FPC:=$(shell $(FPCPROG) -PB)'#010, - '# Older fpc executables didn'#039't support it and return'#010+ + 'FPC:=$(shell $(FPCPROG) -PB)'#010+ + '# ','Older fpc executables didn'#039't support it and return'#010+ '# Error: Illegal processor... When found then fallback to ppc386'#010+ 'ifneq ($(findstring Error,$(FPC)),)'#010+ 'override FPC=ppc386'#010+ 'endif'#010+ 'else'#010+ '# fpc binary not found, fallback to ppc386'#010+ - 'override FPC','=ppc386'#010+ + 'override FPC=p','pc386'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -177,7 +177,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# FPC version'#010+ 'ifndef FPC_VERSION'#010+ '# For 1.1 and up we can use a single compiler call to retrieve'#010+ - '# ','all needed information'#010+ + '# al','l needed information'#010+ 'FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#010+ 'FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ @@ -185,14 +185,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'export FPC FPC_VERSION FPC_COMPILERINFO'#010+ '# CHECKDEPEND should not be exported'#010+ '# This should limit multiple checks'#010+ - 'unexport',' CHECKDEPEND ALLDEPENDENCIES'#010+ + 'unexport C','HECKDEPEND ALLDEPENDENCIES'#010+ #010+ '#####################################################################'#010+ '# FPC Target Detection'#010+ '#####################################################################'#010+ #010+ '# Fall back to default values if needed'#010+ - 'ifndef',' CPU_TARGET'#010+ + 'ifndef C','PU_TARGET'#010+ 'ifdef CPU_TARGET_DEFAULT'#010+ 'CPU_TARGET=$(CPU_TARGET_DEFAULT)'#010+ 'endif'#010+ @@ -204,7 +204,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '# For 1.0.x we need to use extra calls to retrieve all info'#010+ - 'ifneq ($(word','s $(FPC_COMPILERINFO)),5)'#010+ + 'ifneq ($(words ','$(FPC_COMPILERINFO)),5)'#010+ 'FPC_COMPILERINFO+=$(shell $(FPC) -iSP)'#010+ 'FPC_COMPILERINFO+=$(shell $(FPC) -iTP)'#010+ 'FPC_COMPILERINFO+=$(shell $(FPC) -iSO)'#010+ @@ -212,7 +212,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '# Retrieve Target/Source CPU and Target/Source OS'#010+ - 'i','fndef CPU_SOURCE'#010+ + 'ifn','def CPU_SOURCE'#010+ 'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ 'ifndef CPU_TARGET'#010+ @@ -222,7 +222,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ 'ifndef OS_TARGET'#010+ - 'OS_TARGET:=$(word 5,$(FPC_CO','MPILERINFO))'#010+ + 'OS_TARGET:=$(word 5,$(FPC_COMP','ILERINFO))'#010+ 'endif'#010+ #010+ '# Full name of the target, including CPU and OS'#010+ @@ -234,11 +234,11 @@ const fpcmakeini : array[0..182,1..240] of char=( 'CROSSCOMPILE=1'#010+ 'endif'#010+ #010+ - '# Check if t','he Makefile supports this target, but not'#010+ + '# Check if the',' Makefile supports this target, but not'#010+ '# when the make target is to rebuild the makefile'#010+ 'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+ 'ifeq ($(findstring $(OS_TARGET),$(MAKEFILETARGETS)),)'#010+ - '$(error The Makefile doesn'#039't support target $(O','S_TARGET), please'+ + '$(error The Makefile doesn'#039't support target $(OS_','TARGET), please'+ ' run fpcmake first)'#010+ 'endif'#010+ 'endif'#010+ @@ -249,14 +249,14 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '[fpcdircheckenv]'#010+ '#####################################################################'#010+ - '# FPCDIR Settin','g'#010+ + '# FPCDIR Setting'#010, '#####################################################################'#010+ #010+ '# Test FPCDIR to look if the RTL dir exists'#010+ 'ifdef FPCDIR'#010+ 'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ - 'override FPCDIR=','wrong'#010+ + 'override FPCDIR=wr','ong'#010+ 'endif'#010+ 'else'#010+ 'override FPCDIR=wrong'#010+ @@ -267,7 +267,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(FPCDIR),wrong)'#010+ 'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ - 'override FPCD','IR=wrong'#010+ + 'override FPCDIR','=wrong'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -281,12 +281,12 @@ const fpcmakeini : array[0..182,1..240] of char=( 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ - 'over','ride FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(a'+ + 'overri','de FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(a'+ 'ddsuffix /$(FPC),$(SEARCHPATH))))))'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR:=$(FPCDIR)/..'#010+ - 'ifeq ($(wildcard $(addpref','ix $(FPCDIR)/,rtl units)),)'#010+ + 'ifeq ($(wildcard $(addprefix',' $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR=c:/pp'#010+ 'endif'#010+ 'endif'#010+ @@ -300,7 +300,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# Cross target dir'#010+ 'ifndef CROSSTARGETDIR'#010+ - 'CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGE','T)'#010+ + 'CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)',#010+ 'endif'#010+ #010+ '# Units dir, when cross compiling try first the'#010+ @@ -310,7 +310,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ 'endif'#010+ 'else'#010+ - 'UNITSDIR:=$(wildcard $(FPCDIR)/unit','s/$(OS_TARGET))'#010+ + 'UNITSDIR:=$(wildcard $(FPCDIR)/units/','$(OS_TARGET))'#010+ 'endif'#010+ #010+ '# Packages dir'#010+ @@ -321,7 +321,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '[shelltools]'#010+ '#####################################################################'#010+ '# Shell tools'#010+ - '###################','#################################################'+ + '#####################','###############################################'+ '#'#010+ #010+ '# Echo that can redir (must be able run in the default OS shell)'#010+ @@ -334,7 +334,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ #010+ - '#',' Copy a whole tree'#010+ + '# C','opy a whole tree'#010+ 'ifndef COPYTREE'#010+ 'COPYTREE:=$(CPPROG) -rfp'#010+ 'endif'#010+ @@ -351,7 +351,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# Check deltree program'#010+ 'ifndef DELTREE'#010+ - 'DELTREE:=$(RMPROG) ','-rf'#010+ + 'DELTREE:=$(RMPROG) -r','f'#010+ 'endif'#010+ #010+ '# To install files'#010+ @@ -369,7 +369,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ - 'endi','f'#010+ + 'endif'#010, 'endif'#010+ #010+ '# To make a directory.'#010+ @@ -382,8 +382,8 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ #010+ '[defaultdirs]'#010+ - '#####################################################################'#010, - '# Default Directories'#010+ + '#####################################################################'#010+ + '# ','Default Directories'#010+ '#####################################################################'#010+ #010+ '# Units dir'#010+ @@ -393,7 +393,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# Units dir'#010+ 'ifdef REQUIRE_PACKAGESDIR'#010+ - 'override PACKAGESDIR+=$(REQU','IRE_PACKAGESDIR)'#010+ + 'override PACKAGESDIR+=$(REQUIR','E_PACKAGESDIR)'#010+ 'endif'#010+ #010+ #010+ @@ -402,7 +402,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ - 'ifeq ($(OS_TARGET),li','nux)'#010+ + 'ifeq ($(OS_TARGET),linu','x)'#010+ 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),freebsd)'#010+ @@ -418,7 +418,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(OS_TARGET),sunos)'#010+ 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ - 'ifeq ($(OS','_TARGET),qnx)'#010+ + 'ifeq ($(OS_T','ARGET),qnx)'#010+ 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ 'else'#010+ @@ -433,7 +433,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'UNIXINSTALLDIR=1'#010+ 'endif'#010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ - 'UNI','XINSTALLDIR=1'#010+ + 'UNIXI','NSTALLDIR=1'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),sunos)'#010+ 'UNIXINSTALLDIR=1'#010+ @@ -447,8 +447,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifndef INSTALL_PREFIX'#010+ 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ - 'endif'#010, 'endif'#010+ + 'en','dif'#010+ #010+ '# set the prefix directory where to install everything'#010+ 'ifndef INSTALL_PREFIX'#010+ @@ -462,7 +462,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'e','xport INSTALL_PREFIX'#010+ + 'exp','ort INSTALL_PREFIX'#010+ #010+ '# Export also INSTALL_SOURCESUBDIR set so it will be'#010+ '# used recursively for all subdirs'#010+ @@ -472,7 +472,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# Where to place the resulting zip files'#010+ 'ifndef DIST_DESTDIR'#010+ - 'DIST_DESTDIR:','=$(BASEDIR)'#010+ + 'DIST_DESTDIR:=$','(BASEDIR)'#010+ 'endif'#010+ 'export DIST_DESTDIR'#010+ #010+ @@ -481,7 +481,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Install Directories'#010+ '#####################################################################'#010+ #010+ - '# set the base directory where to ins','tall everything'#010+ + '# set the base directory where to insta','ll everything'#010+ 'ifndef INSTALL_BASEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -490,7 +490,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_BASEDIR:=$(INSTALL','_PREFIX)'#010+ + 'INSTALL_BASEDIR:=$(INSTALL_P','REFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -500,7 +500,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ - '# for FPC packages install the binaries und','er their os target subdir'+ + '# for FPC packages install the binaries under',' their os target subdir'+ #010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)'#010+ @@ -510,7 +510,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ - '# If cross compiling install in the cross compile di','rectory'#010+ + '# If cross compiling install in the cross compile dire','ctory'#010+ 'ifdef CROSSCOMPILE'#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/units'#010+ 'else'#010+ @@ -518,7 +518,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef PACKAGE_NAME'#010+ - 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PA','CKAGE_NAME)'#010+ + 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACK','AGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -532,8 +532,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where the source files will be stored',#010+ - 'ifndef INSTALL_SOURCEDIR'#010+ + '# Where the source files will be stored'#010+ + 'i','fndef INSTALL_SOURCEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'ifdef BSDhier'#010+ 'SRCPREFIXDIR=share/src'#010+ @@ -543,7 +543,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ - ')/$(INSTA','LL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ + ')/$(INSTALL','_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(PACKAGE_NAME)'#010+ @@ -553,7 +553,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '(PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ - 'ifdef I','NSTALL_FPCPACKAGE'#010+ + 'ifdef INS','TALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+ 'CKAGE_NAME)'#010+ @@ -561,7 +561,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/s','ource'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/sou','rce'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -575,7 +575,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'DOCPREFIXDIR=doc'#010+ 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIX','DIR)/fpc-$(FPC_VERSION)'+ + 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDI','R)/fpc-$(FPC_VERSION)'+ '/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_NAME)-$(PA'+ @@ -585,7 +585,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_DOCDIR',':=$(INSTALL_BASEDIR)/doc'#010+ + 'INSTALL_DOCDIR:=','$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -595,7 +595,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifndef INSTALL_EXAMPLEDIR'#010+ 'ifdef UNIXINSTALLDIR'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'i','fdef BSDhier'#010+ + 'ifd','ef BSDhier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+ ')/$(PACKAGE_NAME)'#010+ 'else'#010+ @@ -604,7 +604,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'else'#010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(I','NSTALL_PREFIX)/share/examples/$(PACKAGE_NAME)'+ + 'INSTALL_EXAMPLEDIR:=$(INS','TALL_PREFIX)/share/examples/$(PACKAGE_NAME)'+ '-$(PACKAGE_VERSION)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ @@ -613,7 +613,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(P','ACKAGE_NAME)'#010+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PAC','KAGE_NAME)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ 'endif'#010+ @@ -625,20 +625,20 @@ const fpcmakeini : array[0..182,1..240] of char=( 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ - '########################################','############################'+ + '##########################################','##########################'+ '#'#010+ '# Cross compile dirs'#010+ '#####################################################################'#010+ #010+ 'ifdef CROSSCOMPILE'#010+ '# Directory where the cross compile tools are stored.'#010+ - '# First check if they are available in FPCDIR','. If no targets/ subdir'+ + '# First check if they are available in FPCDIR. ','If no targets/ subdir'+ #010+ '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ - 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_T','ARGET)/bin/'+ + 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TAR','GET)/bin/'+ '$(FULL_SOURCE))'#010+ 'endif'#010+ 'endif'#010+ @@ -654,7 +654,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{ print'+ ' $$4 } '#039'`)'#010+ 'endif'#010+ - 'ifeq ($(O','S_TARGET),linux)'#010+ + 'ifeq ($(OS_','TARGET),linux)'#010+ 'ifndef OTHERLIBDIR'#010+ 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ '"; print $1 }'#039')'#010+ @@ -668,7 +668,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ #010+ '[extensions]'#010+ - '####','################################################################'+ + '######','##############################################################'+ '#'#010+ '# Default extensions'#010+ '#####################################################################'#010+ @@ -677,7 +677,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'LOADEREXT=.as'#010+ 'EXEEXT=.exe'#010+ 'PPLEXT=.ppl'#010+ - 'P','PUEXT=.ppu'#010+ + 'PPU','EXT=.ppu'#010+ 'OEXT=.o'#010+ 'ASMEXT=.s'#010+ 'SMARTEXT=.sl'#010+ @@ -689,7 +689,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# 1.0.x has target specific extensions for ppu files and objects'#010+ 'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ - '# short ','version for 1.1 and above - no target specific extensions'#010+ + '# short ve','rsion for 1.1 and above - no target specific extensions'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ @@ -702,7 +702,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(OS_TARGET),go32v2)'#010+ 'STATICLIBPREFIX='#010+ 'FPCMADE=fpcmade.dos'#010+ - 'ZIPSUFFIX=go','32'#010+ + 'ZIPSUFFIX=go32',#010+ 'endif'#010+ #010+ '# Linux'#010+ @@ -722,7 +722,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '# NetBSD'#010+ - 'ifeq ($(OS_','TARGET),netbsd)'#010+ + 'ifeq ($(OS_TA','RGET),netbsd)'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'FPCMADE=fpcmade.netbsd'#010+ @@ -739,7 +739,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# Win32'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ - 'SHAREDLIBE','XT=.dll'#010+ + 'SHAREDLIBEXT','=.dll'#010+ 'FPCMADE=fpcmade.w32'#010+ 'ZIPSUFFIX=w32'#010+ 'endif'#010+ @@ -758,7 +758,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(OS_TARGET),emx)'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'S','HAREDLIBEXT=.dll'#010+ + 'SHA','REDLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.emx'#010+ 'ZIPSUFFIX=emx'#010+ 'ECHO=echo'#010+ @@ -778,7 +778,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '# BeOS'#010+ - 'i','feq ($(OS_TARGET),beos)'#010+ + 'ife','q ($(OS_TARGET),beos)'#010+ 'EXEEXT='#010+ 'FPCMADE=fpcmade.be'#010+ 'ZIPSUFFIX=be'#010+ @@ -798,7 +798,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ZIPSUFFIX=qnx'#010+ 'endif'#010+ #010+ - '# Net','ware'#010+ + '# Netwa','re'#010+ 'ifeq ($(OS_TARGET),netware)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ @@ -816,7 +816,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# long version for 1.0.x - target specific extensions'#010+ #010+ '# Go32v1'#010+ - 'i','feq ($(OS_TARGET),go32v1)'#010+ + 'ife','q ($(OS_TARGET),go32v1)'#010+ 'PPUEXT=.pp1'#010+ 'OEXT=.o1'#010+ 'ASMEXT=.s1'#010+ @@ -831,8 +831,8 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ 'STATICLIBPREFIX='#010+ - 'FPCMADE=fpcmade.dos'#010, - 'ZIPSUFFIX=go32'#010+ + 'FPCMADE=fpcmade.dos'#010+ + 'ZI','PSUFFIX=go32'#010+ 'endif'#010+ #010+ '# Linux'#010+ @@ -851,8 +851,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ZIPSUFFIX=freebsd'#010+ 'endif'#010+ #010+ - '# NetBSD',#010+ - 'ifeq ($(OS_TARGET),netbsd)'#010+ + '# NetBSD'#010+ + 'i','feq ($(OS_TARGET),netbsd)'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'FPCMADE=fpcmade.netbsd'#010+ @@ -868,7 +868,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '# Win32'#010+ - 'ifeq ($(OS_TARGET),win32',')'#010+ + 'ifeq ($(OS_TARGET),win32)'#010, 'PPUEXT=.ppw'#010+ 'OEXT=.ow'#010+ 'ASMEXT=.sw'#010+ @@ -887,7 +887,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'AOUTEXT=.out'#010+ 'SMARTEXT=.sl2'#010+ 'STATICLIBPREFIX='#010+ - 'STATICL','IBEXT=.ao2'#010+ + 'STATICLIB','EXT=.ao2'#010+ 'SHAREDLIBEXT=.dll'#010+ 'FPCMADE=fpcmade.os2'#010+ 'ZIPSUFFIX=emx'#010+ @@ -906,8 +906,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'FPCMADE=fpcmade.amg'#010+ 'endif'#010+ #010+ - '# Atari'#010, - 'ifeq ($(OS_TARGET),atari)'#010+ + '# Atari'#010+ + 'if','eq ($(OS_TARGET),atari)'#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ @@ -925,7 +925,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ - 'FPCMADE=fpcmade.b','e'#010+ + 'FPCMADE=fpcmade.be'#010, 'ZIPSUFFIX=be'#010+ 'endif'#010+ #010+ @@ -947,7 +947,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ - 'S','TATICLIBEXT=.a'#010+ + 'STA','TICLIBEXT=.a'#010+ 'EXEEXT='#010+ 'FPCMADE=fpcmade.qnx'#010+ 'ZIPSUFFIX=qnx'#010+ @@ -964,8 +964,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'SHAREDLIBEXT=.nlm'#010+ 'FPCMADE=fpcmade.nw'#010+ 'ZIPSUFFIX=nw'#010+ - 'EXEEXT=.nlm'#010, - 'endif'#010+ + 'EXEEXT=.nlm'#010+ + 'en','dif'#010+ #010+ '# MacOS'#010+ 'ifeq ($(OS_TARGET),macos)'#010+ @@ -982,7 +982,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '[defaulttools]'#010+ - '##################################################','##################'+ + '####################################################','################'+ '#'#010+ '# Default Tools'#010+ '#####################################################################'#010+ @@ -996,7 +996,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ASNAME=asw'#010+ 'LDNAME=ldw'#010+ 'ARNAME=arw'#010+ - 'endi','f'#010+ + 'endif'#010, #010+ '# assembler, redefine it if cross compiling'#010+ 'ifndef ASPROG'#010+ @@ -1010,7 +1010,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# linker, but probably not used'#010+ 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'LDPROG=$(CROSSBIND','IR)/$(LDNAME)$(SRCEXEEXT)'#010+ + 'LDPROG=$(CROSSBINDIR',')/$(LDNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'LDPROG=$(LDNAME)'#010+ 'endif'#010+ @@ -1028,7 +1028,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Archiver'#010+ 'ifndef ARPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'ARPRO','G=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ + 'ARPROG=','$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)'#010+ 'else'#010+ 'ARPROG=$(ARNAME)'#010+ 'endif'#010+ @@ -1045,7 +1045,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# ldconfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ - 'LDCON','FIG=ldconfig'#010+ + 'LDCONFI','G=ldconfig'#010+ 'else'#010+ 'LDCONFIG='#010+ 'endif'#010+ @@ -1060,7 +1060,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'uase'#010+ '# upx uses that one itself (PFV)'#010+ 'ifndef UPXPROG'#010+ - 'ifeq ($(OS_TARGET),g','o32v2)'#010+ + 'ifeq ($(OS_TARGET),go3','2v2)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ @@ -1075,8 +1075,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'UPXPROG:=$(firstword $(UPXPROG))'#010+ 'endif'#010+ 'else'#010+ - 'UPXPROG=',#010+ - 'endif'#010+ + 'UPXPROG='#010+ + 'e','ndif'#010+ 'endif'#010+ 'export UPXPROG'#010+ #010+ @@ -1095,7 +1095,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ #010+ '[command_begin]'#010+ - '###########################################################','#########'+ + '#############################################################','#######'+ '#'#010+ '# Compiler Command Line'#010+ '#####################################################################'#010+ @@ -1103,7 +1103,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+ '# compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ - 'override FP','COPTDEF=$(CPU_TARGET)'#010+ + 'override FPCO','PTDEF=$(CPU_TARGET)'#010+ 'endif'#010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ @@ -1114,8 +1114,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ 'endif'#010+ - #010, - '# User dirs should be first, so they are looked at first'#010+ + #010+ + '# ','User dirs should be first, so they are looked at first'#010+ 'ifdef UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ @@ -1123,7 +1123,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR)',')'#010+ + 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010, 'endif'#010+ 'ifdef INCDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ @@ -1141,7 +1141,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# Debug'#010+ 'ifdef DEBUG'#010+ - 'override FPCOPT+=-g','l'#010+ + 'override FPCOPT+=-gl'#010, 'override FPCOPTDEF+=DEBUG'#010+ 'endif'#010+ #010+ @@ -1154,7 +1154,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'override FPCOPT+=-Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ - 'end','if'#010+ + 'endif',#010+ #010+ '# Strip'#010+ 'ifdef STRIP'#010+ @@ -1171,7 +1171,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Verbose settings (warning,note,info)'#010+ 'ifdef VERBOSE'#010+ 'override FPCOPT+=-vwni'#010+ - 'en','dif'#010+ + 'endi','f'#010+ #010+ '# Needed compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ @@ -1181,7 +1181,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+ - 'override FPCOPT+=$(addprefix -Fl,$','(COMPILER_LIBRARYDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(C','OMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ @@ -1191,7 +1191,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '# Cross compiler utils'#010+ - 'ifdef CROSS','BINDIR'#010+ + 'ifdef CROSSBI','NDIR'#010+ 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ @@ -1201,7 +1201,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ - 'override',' TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ + 'override T','ARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1211,7 +1211,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPR','EFIX=$(COMPILER_UNITTARGETDIR)/'#010+ + 'override UNITTARGETDIRPREF','IX=$(COMPILER_UNITTARGETDIR)/'#010+ 'endif'#010+ 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ @@ -1220,7 +1220,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Temporary hack to add HASUNIX define for linux 1.0.6 co','mpiler'#010+ + '# Temporary hack to add HASUNIX define for linux 1.0.6 comp','iler'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ 'ifeq ($(FPC_VERSION),1.0.6)'#010+ 'override FPCOPTDEF+=HASUNIX'#010+ @@ -1233,7 +1233,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ - 'override FPCOPT+=$(add','prefix -Fl,$(OTHERLIBDIR))'#010+ + 'override FPCOPT+=$(addpr','efix -Fl,$(OTHERLIBDIR))'#010+ 'endif'#010+ #010+ #010+ @@ -1245,7 +1245,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ - 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF','))'#010+ + 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))',#010+ 'endif'#010+ #010+ '# Was a config file specified ?'#010+ @@ -1260,7 +1260,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'export FPCEXTCMD'#010+ 'endif'#010+ #010+ - '# ','Compiler commandline'#010+ + '# Co','mpiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ '# also call ppas if with command option -s'#010+ @@ -1268,7 +1268,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ - 'ifeq ($(FULL_SOURCE),$(FULL_TA','RGET))'#010+ + 'ifeq ($(FULL_SOURCE),$(FULL_TARG','ET))'#010+ 'EXECPPAS:=@$(PPAS)'#010+ 'endif'#010+ 'endif'#010+ @@ -1281,7 +1281,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '.PHONY: fpc_loaders'#010+ #010+ - 'ifdef TARGET_L','OADERS'#010+ + 'ifdef TARGET_LOA','DERS'#010+ 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ @@ -1290,7 +1290,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ - ' $(AS) -o $*$(OE','XT) $<'#010+ + ' $(AS) -o $*$(OEXT',') $<'#010+ #010+ 'fpc_loaders: $(LOADEROFILES)'#010+ #010+ @@ -1303,7 +1303,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ #010+ '[unitrules]'#010+ - '#########################','###########################################'+ + '###########################','#########################################'+ '#'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -1313,14 +1313,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef TARGET_UNITS'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(T','ARGET_UNITS))'#010+ + 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TAR','GET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ - 'fpc_units: $','(UNITPPUFILES)'#010+ + 'fpc_units: $(U','NITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ @@ -1331,19 +1331,19 @@ const fpcmakeini : array[0..182,1..240] of char=( '.PHONY: fpc_exes'#010+ #010+ 'ifdef TARGET_PROGRAMS'#010+ - 'override EXEFILES=$(adds','uffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ + 'override EXEFILES=$(addsuf','fix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ 'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ - 'override INSTALLEXEFILES+=$(EXEFIL','ES)'#010+ + 'override INSTALLEXEFILES+=$(EXEFILES',')'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))',#010+ - 'endif'#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ + 'e','ndif'#010+ 'endif'#010+ #010+ 'fpc_exes: $(EXEFILES)'#010+ @@ -1355,7 +1355,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '#####################################################################'#010+ #010+ 'ifdef TARGET_RSTS'#010+ - 'override RSTF','ILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ + 'override RSTFIL','ES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ 'endif'#010+ @@ -1364,7 +1364,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '########################################################','############'+ + '##########################################################','##########'+ '#'#010+ #010+ '.PHONY: fpc_examples'#010+ @@ -1373,14 +1373,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET','_EXAMPLES))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_E','XAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES'+ ')))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'ov','erride CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'over','ride CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ @@ -1390,7 +1390,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(','EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ + 'fpc_examples: all $(EX','AMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ 'IRS))'#010+ #010+ #010+ @@ -1399,7 +1399,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# General compile rules'#010+ '#####################################################################'#010+ #010+ - '.PHO','NY: fpc_all fpc_smart fpc_debug fpc_release'#010+ + '.PHONY',': fpc_all fpc_smart fpc_debug fpc_release'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1410,7 +1410,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ - ' $(MAKE) ','all DEBUG=1'#010+ + ' $(MAKE) al','l DEBUG=1'#010+ #010+ 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ @@ -1422,7 +1422,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $<'#010+ - ' ',' $(EXECPPAS)'#010+ + ' $','(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ @@ -1438,15 +1438,15 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ - #010, - '# Search paths for .ppu and .pp and .pas'#010+ + #010+ + '# ','Search paths for .ppu and .pp and .pas'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ #010+ '[libraryrules]'#010+ - '##########################','##########################################'+ + '############################','########################################'+ '#'#010+ '# Library'#010+ '#####################################################################'#010+ @@ -1457,7 +1457,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef LIB_VERSION'#010+ 'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSION)'#010+ 'else'#010+ - 'LIB_FULLNAME','=$(LIB_NAME)'#010+ + 'LIB_FULLNAME=$','(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1470,7 +1470,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef HASSHAREDLIB'#010+ ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ 'else'#010+ - ' ','@$(ECHO) Shared Libraries not supported'#010+ + ' @$','(ECHO) Shared Libraries not supported'#010+ 'endif'#010+ #010+ #010+ @@ -1479,7 +1479,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Install rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_install ','fpc_sourceinstall fpc_exampleinstall'#010+ + '.PHONY: fpc_install fp','c_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ @@ -1487,14 +1487,14 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ 'ifdef INSTALL_BUILDUNIT'#010+ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ - '(INSTALLPPUFILE','S))'#010+ + '(INSTALLPPUFILES)',')'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ 'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+ ',$(INSTALLPPUFILES)))'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITT','ARGETDIRPREFIX),$(INSTA'+ + 'override INSTALLPPUFILES:=$(addprefix $(UNITTAR','GETDIRPREFIX),$(INSTA'+ 'LLPPUFILES))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ 'EFIX),$(INSTALLPPULINKFILES)))'#010+ @@ -1503,7 +1503,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ - 'overr','ide INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+ + 'overrid','e INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+ 'EFILES))'#010+ 'endif'#010+ #010+ @@ -1512,7 +1512,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(MKDIR) $(INSTALL_BINDIR)'#010+ '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ - ' -$(UPXPROG',') $(INSTALLEXEFILES)'#010+ + ' -$(UPXPROG) ','$(INSTALLEXEFILES)'#010+ 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ @@ -1520,7 +1520,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ - '# a safety check is done if Ma','kefile.fpc is available'#010+ + '# a safety check is done if Make','file.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+ @@ -1529,14 +1529,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010, - 'ifdef INSTALLPPUFILES'#010+ + 'endif'#010+ + 'if','def INSTALLPPUFILES'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ - 'ifneq ($(wildcard $(LIB_FU','LLNAME)),)'#010+ + 'ifneq ($(wildcard $(LIB_FULL','NAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ @@ -1545,7 +1545,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef INSTALL_FILES'#010+ - ' $(MKDIR) $(INSTALL_DA','TADIR)'#010+ + ' $(MKDIR) $(INSTALL_DATA','DIR)'#010+ ' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ @@ -1553,7 +1553,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ - 'fpc_exampleinstall: $(addsuffix _distclean,$(TARG','ET_EXAMPLEDIRS))'#010+ + 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET','_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ @@ -1561,7 +1561,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(COPYTREE) $(addsuffix /*,$(TARGET_','EXAMPLEDIRS)) $(INSTALL_'+ + ' $(COPYTREE) $(addsuffix /*,$(TARGET_EX','AMPLEDIRS)) $(INSTALL_'+ 'EXAMPLEDIR)'#010+ 'endif'#010+ #010+ @@ -1570,7 +1570,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Dist Install'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_distinstal','l'#010+ + '.PHONY: fpc_distinstall'#010, #010+ 'fpc_distinstall: install exampleinstall'#010+ #010+ @@ -1580,7 +1580,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zip','sourceinstall fpc_zipexampleinstall'#010+ + '.PHONY: fpc_zipinstall fpc_zipso','urceinstall fpc_zipexampleinstall'#010+ #010+ '# Temporary path to pack a file, can only use a single deep'#010+ '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ @@ -1588,7 +1588,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ - 'PACKDIR=/tmp/','fpc-pack'#010+ + 'PACKDIR=/tmp/fp','c-pack'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1603,7 +1603,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '# ZipTarget'#010+ 'ifndef ZIPTARGET'#010+ - 'ifdef DIST_ZIPTAR','GET'#010+ + 'ifdef DIST_ZIPTARGE','T'#010+ 'ZIPTARGET=DIST_ZIPTARGET'#010+ 'else'#010+ 'ZIPTARGET=install'#010+ @@ -1622,7 +1622,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to ','be able to run in the current OS so fix'#010+ + '# We need to be',' able to run in the current OS so fix'#010+ '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ @@ -1631,14 +1631,14 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ - '# Create commands to create the zip/tar file'#010, - 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ + '# Create commands to create the zip/tar file'#010+ + 'ZI','PCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ - 'ZIPDESTFILE:=','$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ + 'ZIPDESTFILE:=$(','DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ 'TFILE) *'#010+ 'endif'#010+ @@ -1646,20 +1646,20 @@ const fpcmakeini : array[0..182,1..240] of char=( 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ - ' ',' $(DEL) $(ZIPDESTFILE)'#010+ + ' ',' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ '# Handle gecho separate as we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ 'R)'#010+ - ' $(ECHOREDIR) -e "$(subst \,\\',',$(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ + ' $(ECHOREDIR) -e "$(subst \,\\,$','(ZIPCMD_ZIP))" >> $(ZIPWRAPPE'+ 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+ 'ER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ ' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+ - ' echo $(ZIPCMD_CDBASE) >> $(ZI','PWRAPPER)'#010+ + ' echo $(ZIPCMD_CDBASE) >> $(ZIPW','RAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ @@ -1672,7 +1672,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ #010+ - 'fpc_zipsourceinst','all:'#010+ + 'fpc_zipsourceinstal','l:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src'#010+ #010+ 'fpc_zipexampleinstall:'#010+ @@ -1681,7 +1681,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ 'fpc_zipdistinstall:'#010+ - ' $(MAKE) fpc_zipinst','all ZIPTARGET=distinstall'#010+ + ' $(MAKE) fpc_zipinstal','l ZIPTARGET=distinstall'#010+ #010+ #010+ '[cleanrules]'#010+ @@ -1689,8 +1689,8 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Clean rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_clean fpc_cleanall fpc_distclean',#010+ - #010+ + '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ + #010, 'ifdef EXEFILES'#010+ 'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+ '))'#010+ @@ -1701,12 +1701,12 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:=$(subst ','$(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'override CLEANPPULINKFILES:=$(subst $(','PPUEXT),$(OEXT),$(CLEANPPUFILE'+ 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ '(CLEANPPUFILES)))'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ - 'override CLEANPPULINKFILES:=$(wildcard $(ad','dprefix $(UNITTARGETDIRPR'+ + 'override CLEANPPULINKFILES:=$(wildcard $(addp','refix $(UNITTARGETDIRPR'+ 'EFIX),$(CLEANPPULINKFILES)))'#010+ 'endif'#010+ #010+ @@ -1718,7 +1718,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' ',' -$(DEL) $(CLEANPPULINKFILES)'#010+ + ' ',' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ @@ -1727,7 +1727,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' -$(DEL) $(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ - ' -$(DEL) $(LIB_NAME) $(LIB_FUL','LNAME)'#010+ + ' -$(DEL) $(LIB_NAME) $(LIB_FULLN','AME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#010+ @@ -1735,7 +1735,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'fpc_distclean: clean'#010+ #010+ '# Also run clean first if targetdir is set. Unittargetdir is always'#010+ - '# set if targetdir or unittargetdir is spe','cified'#010+ + '# set if targetdir or unittargetdir is speci','fied'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'TARGETDIRCLEAN=fpc_clean'#010+ 'endif'#010+ @@ -1744,8 +1744,8 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATI','CL'+ - 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL','I'+ + 'BEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ 'PCEXTFILE) $(REDIRFILE)'#010+ @@ -1755,7 +1755,7 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '##########','##########################################################'+ + '############','########################################################'+ '#'#010+ '# Base info rules'#010+ '#####################################################################'#010+ @@ -1766,30 +1766,30 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ - ' ',' @$(ECHO) == Package info =='#010+ + ' ',' @$(ECHO) == Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ ' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) FPC..','........ $(FPC)'#010+ + ' @$(ECHO) FPC....','...... $(FPC)'#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ ' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ - ' @$(ECHO) Target OS.... $(OS_TAR','GET)'#010+ + ' @$(ECHO) Target OS.... $(OS_TARGE','T)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ - ' @$(EC','HO)'#010+ + ' @$(ECHO',')'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ - ' @$(ECHO) PackagesDir..... $(PACKAGESDIR',')'#010+ + ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010, ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ @@ -1797,56 +1797,56 @@ const fpcmakeini : array[0..182,1..240] of char=( ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ - ' @$(ECHO) L','d........ $(LD)'#010+ + ' @$(ECHO) Ld.','....... $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ - ' @$(ECHO) GI','nstall.. $(GINSTALL)'#010+ + ' @$(ECHO) GIns','tall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ - ' @$(ECHO) Upx......','. $(UPXPROG)'#010+ + ' @$(ECHO) Upx....... ','$(UPXPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ - ' ',' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ + ' ',' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010, - ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ + ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ + ' ',' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Install Units....','... $(INSTALL_UNITS)'#010+ + ' @$(ECHO) Install Units......','. $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ - ' @$(ECHO) ZipPrefix............ $','(ZIPPREFIX)'#010+ + ' @$(ECHO) ZipPrefix............ $(Z','IPPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ - ' @$(ECHO) Install binary dir.','.. $(INSTALL_BINDIR)'#010+ + ' @$(ECHO) Install binary dir...',' $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ ' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ - ' @$(ECHO) Install doc dir...... $','(INSTALL_DOCDIR)'#010+ + ' @$(ECHO) Install doc dir...... $(I','NSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ - ' @$(ECHO) Dist zip na','me........ $(DIST_ZIPNAME)'#010+ + ' @$(ECHO) Dist zip name','........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ @@ -1856,14 +1856,14 @@ const fpcmakeini : array[0..182,1..240] of char=( #010+ '.PHONY: fpc_info'#010+ #010+ - 'fpc_info: $','(INFORULES)'#010+ + 'fpc_info: $(I','NFORULES)'#010+ #010+ '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub','1 fpc_makefile_su'+ + '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 ','fpc_makefile_su'+ 'b2 \'#010+ ' fpc_makefile_dirs'#010+ #010+ @@ -1875,7 +1875,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_DIRS))'#010+ 'endif'#010+ - 'ifde','f TARGET_EXAMPLEDIRS'#010+ + 'ifdef ','TARGET_EXAMPLEDIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ @@ -1883,7 +1883,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+ 'EXAMPLEDIRS))'#010+ #010+ - 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_','makefile_sub2'#010+ + 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_ma','kefile_sub2'#010+ #010+ 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ @@ -1892,7 +1892,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '# Local Makefile'#010+ '#####################################################################'#010+ #010+ - 'ifne','q ($(wildcard fpcmake.loc),)'#010+ + 'ifneq ','($(wildcard fpcmake.loc),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ @@ -1903,7 +1903,7 @@ const fpcmakeini : array[0..182,1..240] of char=( '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '#####','###############################################################'+ + '#######','#############################################################'+ '#'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ @@ -1913,7 +1913,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'ifeq ($(OS_TARGET),win32)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ - 'LCL_PLA','TFORM=gtk'#010+ + 'LCL_PLATF','ORM=gtk'#010+ 'endif'#010+ 'endif'#010+ 'export LCL_PLATFORM'#010+ @@ -1925,7 +1925,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'override LCLDIR=wrong'#010+ 'endif'#010+ 'else'#010+ - 'override LCLDIR=','wrong'#010+ + 'override LCLDIR=wr','ong'#010+ 'endif'#010+ #010+ '# Check if the default LCLDIR is correct'#010+ @@ -1936,7 +1936,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Check for development versio','n'#010+ + '# Check for development version'#010, 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ @@ -1945,7 +1945,7 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Check for release versio','n'#010+ + '# Check for release version'#010, 'ifeq ($(LCLDIR),wrong)'#010+ 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ @@ -1955,20 +1955,20 @@ const fpcmakeini : array[0..182,1..240] of char=( 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override',' LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+ + 'override L','CLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+ 'LDIR)/units)'#010+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'nts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'overr','ide REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ + 'overrid','e REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '####################################################','################'+ + '######################################################','##############'+ '#'#010+ 'override INFORULES+=lclinfo'#010+ #010+ @@ -1979,7 +1979,7 @@ const fpcmakeini : array[0..182,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(','ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ + ' @$(EC','HO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ ' @$(ECHO)'#010 ); diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 2c0cc30390..4fc17a563c 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -50,7 +50,7 @@ inOS2=1 endif endif else -ifneq ($(findstring cygwin,$(MACHTYPE)),) +ifneq ($(findstring cygdrive,$(PATH)),) inCygWin=1 endif endif