diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index 198338e28c..29f605355c 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -16,10 +16,10 @@ const fpcmakeini : array[0..201,1..240] of char=( '# OS categories'#010+ 'BSDs = freebsd netbsd openbsd darwin'#010+ 'UNIXs = linux $(BSDs) sunos qnx'#010+ - 'LIMIT83fs = go32v2 os2'#010+ + 'LIMIT83fs = go32v2 os2 emx watcom'#010+ #010+ '#Empty target for rules that always should run. Needed if'#010+ - '#the target is non-phoney, and there is non-phony prer','eqisites.'#010+ + '#the target is non-phoney, and there is non','-phony prereqisites.'#010+ '#Then add FORCE as an prerequisite'#010+ '#See gnu make manual: 4.7 Rules without Commands or Prerequisites'#010+ 'FORCE:'#010+ @@ -27,18 +27,18 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '[osdetect]'#010+ '#####################################################################'#010+ - '# Autodetect source OS (Li','nux or Dos or Windows NT or OS/2 or other)'+ + '# Autodetect so','urce OS (Linux or Dos or Windows NT or OS/2 or other)'+ #010+ '# define inUnix when running under Unix like environment'#010+ '# (Linux,FreeBSD,NetBSD,OpenBSD,Darwin,Cygwin)'#010+ '# define inWinNT when running under WinNT'#010+ - '# define inOS2 when running under OS/','2'#010+ + '# define inOS2 when runnin','g under OS/2'#010+ '# define inCygwin when running under Cygwin32'#010+ '#####################################################################'#010+ #010+ '# We need only / in the path also remove the current dir,'#010+ '# also remove trailing /'#039's'#010+ - 'override PATH:=$(patsubst %/,%,$(sub','st \,/,$(PATH)))'#010+ + 'override PATH:=$(patsubst',' %/,%,$(subst \,/,$(PATH)))'#010+ #010+ '# Detect unix'#010+ '# Darwin is handled specially'#010+ @@ -46,8 +46,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'inUnix=1 #darwin'#010+ 'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+ 'else'#010+ - '# Determine if we'#039've a unix searchpath by looking for a ;'#010+ - '# that no','rmally doesn'#039't exists in the unix PATH var.'#010+ + '# Determine if we'#039've a unix searchpath by looking for a ',';'#010+ + '# that normally doesn'#039't exists in the unix PATH var.'#010+ 'ifeq ($(findstring ;,$(PATH)),)'#010+ 'inUnix=1'#010+ 'SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))'#010+ @@ -57,14 +57,14 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# Add path were make is located'#010+ - 'SEARCHPATH+=$(patsubst ','%/,%,$(subst \,/,$(dir $(MAKE))))'#010+ + 'SEARCHPATH+=','$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))'#010+ #010+ '# Search for PWD'#010+ 'PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))'#010+ 'ifeq ($(PWD),)'#010+ 'PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))'#010+ 'ifeq ($(PWD),)'#010+ - '$(error You need the GNU utils package',' to use this Makefile)'#010+ + '$(error You need the GNU ut','ils package to use this Makefile)'#010+ 'else'#010+ 'PWD:=$(firstword $(PWD))'#010+ 'SRCEXEEXT='#010+ @@ -77,7 +77,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Detect NT - NT sets OS to Windows_NT'#010+ '# Detect OS/2 - OS/2 has OS2_SHELL defined'#010+ 'ifndef inUnix'#010+ - 'ifeq ($(OS),Windows_NT',')'#010+ + 'ifeq ($(OS)',',Windows_NT)'#010+ 'inWinNT=1'#010+ 'else'#010+ 'ifdef OS2_SHELL'#010+ @@ -96,8 +96,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'else'#010+ 'ifdef inOS2'#010+ 'SRCBATCHEXT=.cmd'#010+ - 'else'#010+ - 'SRCBATCHE','XT=.bat'#010+ + 'els','e'#010+ + 'SRCBATCHEXT=.bat'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -109,8 +109,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'else'#010+ 'PATHSEP:=$(subst /,\,/)'#010+ '# cygwin bash or sh can not handle backslashs'#010+ - 'ifdef inCygWin'#010+ - 'PATHSEP=','/'#010+ + 'ifdef inCygW','in'#010+ + 'PATHSEP=/'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -120,8 +120,8 @@ const fpcmakeini : array[0..201,1..240] of char=( '# For Cygwin we need to replace /cygdrive/c/ with c:/'#010+ 'ifdef inCygWin'#010+ 'ifneq ($(findstring /cygdrive/,$(BASEDIR)),)'#010+ - 'BASENODIR:=$(patsubst /cygdrive%,%,$(BASEDIR))'#010+ - 'BASED','RIVE:=$(firstword $(subst /, ,$(BASENODIR)))'#010+ + 'BASENODIR:=$(patsubst /cygdrive%,%,$(BASE','DIR))'#010+ + 'BASEDRIVE:=$(firstword $(subst /, ,$(BASENODIR)))'#010+ 'BASEDIR:=$(subst /cygdrive/$(BASEDRIVE)/,$(BASEDRIVE):/,$(BASEDIR))'#010+ 'endif'#010+ 'endif'#010+ @@ -131,8 +131,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Echo is an internal command under OS/2 (and others), so it'#039's alw'+ 'ays found'#010+ - 'ifdef inOS2'#010+ - 'ifnde','f ECHO'#010+ + 'ifdef ','inOS2'#010+ + 'ifndef ECHO'#010+ 'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))'+ '))'#010+ 'ifeq ($(ECHO),)'#010+ @@ -142,9 +142,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ECHO=echo'#010+ 'else'#010+ 'ECHO:=$(firstword $(ECHO))'#010+ - 'endif'#010+ + 'end','if'#010+ 'else'#010+ - 'ECH','O:=$(firstword $(ECHO))'#010+ + 'ECHO:=$(firstword $(ECHO))'#010+ 'endif'#010+ 'endif'#010+ 'export ECHO'#010+ @@ -153,8 +153,8 @@ const fpcmakeini : array[0..201,1..240] of char=( '[fpcdetect]'#010+ '#####################################################################'#010+ '# FPC Binary and Version Detection'#010+ - '####################################################################','#'+ - #010+ + '#########################################################','###########'+ + '#'#010+ #010+ '# Compatibility with old makefiles'#010+ 'ifndef FPC'#010+ @@ -165,22 +165,22 @@ const fpcmakeini : array[0..201,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 when fpc -PB gives'#010+ '# an error ppc386 will be used.'#010+ 'ifndef FPC'#010+ '# check if fpc exists'#010+ 'FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)'+ ')))'#010+ 'ifneq ($(FPCPROG),)'#010+ - 'FPCPROG:=$(firstword $(FPCPROG))'#010+ - 'FPC:=$(shel','l $(FPCPROG) -PB)'#010+ + 'FPCPROG:=$(firstword $(FPCPROG))'#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 p','pc386'#010+ + '# fpc binary not found, fa','llback to ppc386'#010+ 'override FPC=ppc386'#010+ 'endif'#010+ 'endif'#010+ @@ -191,7 +191,7 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# FPC version'#010+ 'ifndef FPC_VERSION'#010+ - '# For 1.1 and up we can use a single compiler c','all to retrieve'#010+ + '# For 1.1 and up we can use a single',' compiler call to retrieve'#010+ '# all needed information'#010+ 'FPC_COMPILERINFO:=$(shell $(FPC) -iVSPTPSOTO)'#010+ 'FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO))'#010+ @@ -199,14 +199,14 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ 'export FPC FPC_VERSION FPC_COMPILERINFO'#010+ '# CHECKDEPEND should not be exported'#010+ - '# This should limit multip','le checks'#010+ + '# This should l','imit multiple checks'#010+ 'unexport CHECKDEPEND ALLDEPENDENCIES'#010+ #010+ '#####################################################################'#010+ '# FPC Target Detection'#010+ '#####################################################################'#010+ #010+ - '# Fall back to default value','s if needed'#010+ + '# Fall back to de','fault values if needed'#010+ 'ifndef CPU_TARGET'#010+ 'ifdef CPU_TARGET_DEFAULT'#010+ 'CPU_TARGET=$(CPU_TARGET_DEFAULT)'#010+ @@ -218,7 +218,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# For 1.0.x we need to use extra calls to retrieve all ','info'#010+ + '# For 1.0.x we need to use extra calls to re','trieve all info'#010+ 'ifneq ($(words $(FPC_COMPILERINFO)),5)'#010+ 'FPC_COMPILERINFO+=$(shell $(FPC) -iSP)'#010+ 'FPC_COMPILERINFO+=$(shell $(FPC) -iTP)'#010+ @@ -226,7 +226,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'FPC_COMPILERINFO+=$(shell $(FPC) -iTO)'#010+ 'endif'#010+ #010+ - '# Retrieve Target/Source CPU and ','Target/Source OS'#010+ + '# Retrieve Target/Sour','ce CPU and Target/Source OS'#010+ 'ifndef CPU_SOURCE'#010+ 'CPU_SOURCE:=$(word 2,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ @@ -236,16 +236,16 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifndef OS_SOURCE'#010+ 'OS_SOURCE:=$(word 4,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ - 'ifndef OS_TARGET'#010+ - 'OS_TARGET:','=$(word 5,$(FPC_COMPILERINFO))'#010+ + 'ifndef OS_TARGET',#010+ + 'OS_TARGET:=$(word 5,$(FPC_COMPILERINFO))'#010+ 'endif'#010+ #010+ '# Full name of the target, including CPU and OS. For OSs limited'#010+ '# to 8.3 we only use the target OS'#010+ 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ 'FULL_TARGET=$(OS_TARGET)'#010+ - 'FULL_SOURCE=$(OS_SOURCE)'#010+ - 'els','e'#010+ + 'FULL_SOURCE=$(OS_','SOURCE)'#010+ + 'else'#010+ 'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ 'FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+ 'endif'#010+ @@ -256,17 +256,17 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# Check if the Makefile supports this target, but not'#010+ - '# when the make ta','rget is to rebuild the makefile'#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 $(OS_TARGET), please r'+ 'un fpcmake first)'#010+ 'endif'#010+ - 'endif'#010+ + 'endif'#010, #010+ #010+ - '# Detect ','BSD, since BSD uses a slightly different directory hierarch'+ - 'y.'#010+ + '# Detect BSD, since BSD uses a slightly different directory hierarchy.'+ + #010+ 'ifneq ($(findstring $(OS_TARGET),$(BSDs)),)'#010+ 'BSDhier=1'#010+ 'endif'#010+ @@ -276,14 +276,14 @@ const fpcmakeini : array[0..201,1..240] of char=( 'linuxHier=1'#010+ 'endif'#010+ #010+ - 'export OS_TAR','GET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SO'+ + 'ex','port OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SO'+ 'URCE CROSSCOMPILE'#010+ #010+ #010+ '[fpcdircheckenv]'#010+ '#####################################################################'#010+ '# FPCDIR Setting'#010+ - '#############################################################','#######'+ + '##################################################','##################'+ '#'#010+ #010+ '# Test FPCDIR to look if the RTL dir exists'#010+ @@ -296,7 +296,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override FPCDIR=wrong'#010+ 'endif'#010+ #010+ - '# Default FPCDIR ','from Makefile.fpc'#010+ + '# Defa','ult FPCDIR from Makefile.fpc'#010+ 'ifdef DEFAULT_FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ 'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+ @@ -307,22 +307,22 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '[fpcdirdetect]'#010+ - '# Detect FPCDIR'#010+ - 'ifeq',' ($(FPCDIR),wrong)'#010+ + '# Detect ','FPCDIR'#010+ + 'ifeq ($(FPCDIR),wrong)'#010+ 'ifdef inUnix'#010+ 'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+ 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ 'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+ 'endif'#010+ 'else'#010+ - 'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard $(','a'+ + 'override 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 $(addprefix $(FPCDIR)/,rtl units)),)'#010+ - 'override FPCDIR:=$(BASEDIR)'#010+ - 'ifeq ($','(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ + 'override FPCDIR:=$(BASED','IR)'#010+ + 'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+ 'override FPCDIR=c:/pp'#010+ 'endif'#010+ 'endif'#010+ @@ -335,7 +335,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'CROSSBINDIR:=$(wildcard $(FPCDIR)/bin/$(FULL_TARGET))'#010+ 'endif'#010+ #010+ - '# Default binutils prefix for cross com','pile when the'#010+ + '# Default binutils prefix fo','r cross compile when the'#010+ '# crossbindir is not set'#010+ 'ifndef BINUTILSPREFIX'#010+ 'ifndef CROSSBINDIR'#010+ @@ -346,7 +346,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# Try first the full target name, otherwise try only'#010+ - '# the OS for backwards com','patibility'#010+ + '# the OS for ba','ckwards compatibility'#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(FULL_TARGET))'#010+ 'ifeq ($(UNITSDIR),)'#010+ 'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+ @@ -354,7 +354,7 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Packages dir'#010+ 'PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/pa'+ - 'ckages/extra)',#010+ + 'ck','ages/extra)'#010+ #010+ #010+ '[shelltools]'#010+ @@ -362,8 +362,8 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Shell tools'#010+ '#####################################################################'#010+ #010+ - '# Echo that can redir (must be able run in the default OS shell)'#010+ - 'ifnd','ef ECHOREDIR'#010+ + '# Echo that can redir (must be able run in the default OS ','shell)'#010+ + 'ifndef ECHOREDIR'#010+ 'ifndef inUnix'#010+ 'ECHOREDIR=echo'#010+ 'else'#010+ @@ -382,7 +382,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# Copy a whole tree'#010+ - 'ifndef MKDIRTREE'#010, + 'ifndef',' MKDIRTREE'#010+ 'MKDIRTREE:=$(MKDIRPROG) -p'#010+ 'endif'#010+ #010+ @@ -401,8 +401,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'DELTREE:=$(RMPROG) -rf'#010+ 'endif'#010+ #010+ - '# To install files'#010+ - 'ifn','def INSTALL'#010+ + '# To instal','l files'#010+ + 'ifndef INSTALL'#010+ 'ifdef inUnix'#010+ 'INSTALL:=$(GINSTALL) -c -m 644'#010+ 'else'#010+ @@ -419,8 +419,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# To make a directory.'#010+ - 'i','fndef MKDIR'#010+ + '# To make a d','irectory.'#010+ + 'ifndef MKDIR'#010+ 'MKDIR:=$(GINSTALL) -m 755 -d'#010+ 'endif'#010+ #010+ @@ -430,9 +430,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '[defaultdirs]'#010+ '#####################################################################'#010+ - '# Default Directories'#010+ - '###########','#########################################################'+ - '#'#010+ + '# Default Directories'#010, + '#####################################################################'#010+ #010+ '# Units dir'#010+ 'ifdef REQUIRE_UNITSDIR'#010+ @@ -442,19 +441,19 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Units dir'#010+ 'ifdef REQUIRE_PACKAGESDIR'#010+ 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ - 'endif'#010+ + 'endif',#010+ #010+ #010+ - '# Unixes',' use unix dirs with /usr/bin, /usr/lib'#010+ + '# Unixes use unix dirs with /usr/bin, /usr/lib'#010+ '# When zipping use the target os default, when normal install then'#010+ '# use the source os as default'#010+ 'ifdef ZIPINSTALL'#010+ '# Zipinstall'#010+ 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ - 'endif'#010+ + 'endif'#010, 'else'#010+ - '# Norm','al install'#010+ + '# Normal install'#010+ 'ifneq ($(findstring $(OS_SOURCE),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ 'endif'#010+ @@ -467,7 +466,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# set the prefix directory where to ','install everything'#010+ + '# set the prefix director','y where to install everything'#010+ 'ifndef INSTALL_PREFIX'#010+ 'ifdef UNIXHier'#010+ 'INSTALL_PREFIX=/usr/local'#010+ @@ -481,7 +480,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'export INSTALL_PREFIX'#010+ #010+ - '# Export also INSTALL_SOURC','ESUBDIR set so it will be'#010+ + '# Export also IN','STALL_SOURCESUBDIR set so it will be'#010+ '# used recursively for all subdirs'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ 'export INSTALL_FPCSUBDIR'#010+ @@ -491,9 +490,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifndef DIST_DESTDIR'#010+ 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ - 'export DIST_DESTDIR'#010+ + 'export DIST_DESTDIR'#010, #010+ - '# EXE/PPU ','Target directories'#010+ + '# EXE/PPU Target directories'#010+ 'ifndef COMPILER_UNITTARGETDIR'#010+ 'ifdef PACKAGEDIR_MAIN'#010+ 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(FULL_TARGET)'#010+ @@ -502,7 +501,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifndef COMPILER_TARGETDIR'#010+ - 'COMPILER_TARGETDIR=','.'#010+ + 'COMPILER','_TARGETDIR=.'#010+ 'endif'#010+ #010+ #010+ @@ -511,7 +510,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '#####################################################################'#010+ #010+ '# set the base directory where to install everything'#010+ - 'ifndef INSTALL','_BASEDIR'#010+ + 'ifn','def INSTALL_BASEDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ @@ -523,14 +522,14 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# set the dire','ctory where to install the binaries'#010+ + '# s','et the directory where to install the binaries'#010+ 'ifndef INSTALL_BINDIR'#010+ 'ifdef UNIXHier'#010+ 'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+ 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+ '# for FPC packages install the binaries under their target subdir'#010+ - 'ifdef INSTALL_FPCPA','CKAGE'#010+ + 'ifdef IN','STALL_FPCPACKAGE'#010+ 'ifdef CROSSCOMPILE'#010+ 'ifdef CROSSINSTALL'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(FULL_SOURCE)'#010+ @@ -542,9 +541,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ - '# set th','e directory where to install the units.'#010+ + '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(FULL_TARGET)'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -552,9 +551,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ - '# Whe','re to install shared libraries'#010+ + '# Where to install shared libraries'#010+ 'ifndef INSTALL_LIBDIR'#010+ 'ifdef UNIXHier'#010+ 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+ @@ -565,8 +564,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Where the source files will be stored'#010+ 'ifndef INSTALL_SOURCEDIR'#010+ - 'ifdef UNIXHier'#010+ - 'i','fdef BSDhier'#010+ + 'ifdef',' UNIXHier'#010+ + 'ifdef BSDhier'#010+ 'SRCPREFIXDIR=share/src'#010+ 'else'#010+ 'ifdef linuxHier'#010+ @@ -577,8 +576,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ - ')/$(INS','TALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VER','SI'+ + 'ON)/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(PACKAGE_NAME)'#010+ @@ -586,9 +585,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ '(PACKAGE_VERSION)'#010+ - 'endif'#010+ + 'endif',#010+ 'else'#010+ - 'ifdef',' INSTALL_FPCPACKAGE'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef INSTALL_FPCSUBDIR'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+ 'CKAGE_NAME)'#010+ @@ -596,7 +595,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)','/source'#010+ + 'INSTALL_SOURCEDIR:=$(INSTA','LL_BASEDIR)/source'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -613,7 +612,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'DOCPREFIXDIR=doc'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALL_FPCPACKAGE',#010+ + 'ifdef INSTALL','_FPCPACKAGE'#010+ 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ '(PACKAGE_NAME)'#010+ 'else'#010+ @@ -622,7 +621,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_BA','SEDIR)/doc/$(PACKAGE_NAME)'#010+ + 'INSTALL_DOCDIR:=$','(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+ 'endif'#010+ @@ -631,8 +630,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Where to install the examples, under linux we use the doc dir'#010+ '# because the copytree command will create a subdir itself'#010+ - 'ifndef INSTALL_EXAMPLEDIR'#010+ - 'i','fdef UNIXHier'#010+ + 'ifndef INSTALL_E','XAMPLEDIR'#010+ + 'ifdef UNIXHier'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ #010+ 'ifdef BSDhier'#010+ @@ -642,7 +641,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ 'else'#010+ - 'INSTALL_EXAMPLEDIR:=$(INS','TALL_PREFIX)/doc/fpc-$(FPC_VERSION)/example'+ + 'INSTALL_EXAMPL','EDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/example'+ 's/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ @@ -654,7 +653,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '(PACKAGE_VERSION)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)','/examples/$(PACKAGE_NAME)-$(PAC'+ + 'INSTALL_EXAMPLEDIR:=$(INST','ALL_DOCDIR)/examples/$(PACKAGE_NAME)-$(PAC'+ 'KAGE_VERSION)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ @@ -665,7 +664,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010, + 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PAC','KAGE_NAME)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ 'endif'#010+ @@ -677,21 +676,21 @@ const fpcmakeini : array[0..201,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 targe','ts/ 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_TARGET)/bin/$(', - 'FULL_SOURCE))'#010+ + 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TAR','GET)/bin/'+ + '$(FULL_SOURCE))'#010+ 'endif'#010+ 'endif'#010+ 'else'#010+ @@ -706,7 +705,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Amd64 to i386?'#010+ 'ifndef GCCLIBDIR'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ - 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010, + 'ifneq ($(findstring x86_64,$(shell un','ame -a)),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)'#010+ 'endif'#010+ @@ -717,8 +716,8 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Try cross gcc'#010+ 'ifndef GCCLIBDIR'#010+ 'CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEE'+ - 'XT),$(SEARCHPATH))))'#010+ - 'if','neq ($(CROSSGCC),)'#010+ + 'XT),$(SEARCH','PATH))))'#010+ + 'ifneq ($(CROSSGCC),)'#010+ 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ @@ -726,9 +725,9 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Other libraries from ld.so.conf'#010+ 'ifndef OTHERLIBDIR'#010+ 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ - '"; print $1 }'#039')'#010+ + '"; print $1 ','}'#039')'#010+ + 'endif'#010+ 'endif'#010+ - 'e','ndif'#010+ #010+ 'ifdef inUnix'#010+ 'ifeq ($(OS_SOURCE),netbsd)'#010+ @@ -741,7 +740,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '[extensions]'#010+ '#####################################################################'#010+ '# Default extensions'#010+ - '########################','############################################'+ + '#############','#######################################################'+ '#'#010+ #010+ '# Default needed extensions (Go32v2,Linux)'#010+ @@ -755,14 +754,14 @@ const fpcmakeini : array[0..201,1..240] of char=( 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ - 'STATICLIBPREFIX=libp'#010+ - 'R','STEXT=.rst'#010+ + 'STATICLIBPR','EFIX=libp'#010+ + 'RSTEXT=.rst'#010+ '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ ' has this'#010+ #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 ta','rget specific extensions'#010+ + '# short version for 1.1 and ab','ove - no target specific extensions'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ @@ -779,7 +778,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# watcom'#010+ - 'ifeq ($(OS_TARGET),watco','m)'#010+ + 'ifeq ($(OS_TA','RGET),watcom)'#010+ 'STATICLIBPREFIX='#010+ 'FPCMADEEXT=wat'#010+ 'ZIPSUFFIX=watc'#010+ @@ -798,7 +797,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# FreeBSD'#010+ - 'ifeq ($(OS_TARGET),freebs','d)'#010+ + 'ifeq ($(OS_TAR','GET),freebsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -817,7 +816,7 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# OpenBSD'#010+ 'ifeq ($(OS_TARGET),openbsd)'#010+ - 'BATCHEXT=.sh',#010+ + 'B','ATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'FPCMADEEXT=obs'#010+ @@ -836,7 +835,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=','.dll'#010+ + 'SH','AREDLIBEXT=.dll'#010+ 'FPCMADEEXT=os2'#010+ 'ZIPSUFFIX=os2'#010+ 'ECHO=echo'#010+ @@ -855,8 +854,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Amiga'#010+ 'ifeq ($(OS_TARGET),amiga)'#010+ - 'EXEEXT='#010+ - 'SHAREDLIB','EXT=.library'#010+ + 'EXEEXT','='#010+ + 'SHAREDLIBEXT=.library'#010+ 'FPCMADEEXT=amg'#010+ 'endif'#010+ #010+ @@ -875,8 +874,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# BeOS'#010+ 'ifeq ($(OS_TARGET),beos)'#010+ - 'BATCHEXT=.sh'#010+ - 'EX','EEXT='#010+ + 'BATC','HEXT=.sh'#010+ + 'EXEEXT='#010+ 'FPCMADEEXT=be'#010+ 'ZIPSUFFIX=be'#010+ 'endif'#010+ @@ -897,8 +896,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ZIPSUFFIX=qnx'#010+ 'endif'#010+ #010+ - '# Netware clib'#010+ - 'ifeq ','($(OS_TARGET),netware)'#010+ + '# Netware',' clib'#010+ + 'ifeq ($(OS_TARGET),netware)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ 'FPCMADEEXT=nw'#010+ @@ -914,9 +913,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# MacOS'#010+ - 'ifeq ($(OS_TARGET),macos)'#010+ + 'ifeq ($(OS_TARGET),macos)'#010, 'BATCHEXT='#010+ - 'E','XEEXT='#010+ + 'EXEEXT='#010+ 'FPCMADEEXT=mac'#010+ 'ZIPSUFFIX=macos'#010+ 'DEBUGSYMEXT=.xcoff'#010+ @@ -931,11 +930,11 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ZIPSUFFIX=darwin'#010+ 'endif'#010+ #010+ - '# Generate fpcmade., use for 8.3 limited OS'#039's the short extens', - 'ion'#010+ + '# Generate fpcmade., use for 8.3 limited OS'#039's the s','hort exten'+ + 'sion'#010+ '# Otherwise use the full name'#010+ 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ - 'FPCMADE=fpcmade$(FPCMADEEXT)'#010+ + 'FPCMADE=fpcmade.$(FPCMADEEXT)'#010+ 'else'#010+ 'FPCMADE=fpcmade.$(FULL_TARGET)'#010+ 'endif'#010+ @@ -944,7 +943,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '# long version for 1.0.x - target specific extensions'#010+ #010+ '# Go32v1'#010+ - 'ifeq ($(OS_TARGE','T),go32v1)'#010+ + 'ifeq',' ($(OS_TARGET),go32v1)'#010+ 'PPUEXT=.pp1'#010+ 'OEXT=.o1'#010+ 'ASMEXT=.s1'#010+ @@ -960,7 +959,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifeq ($(OS_TARGET),go32v2)'#010+ 'STATICLIBPREFIX='#010+ 'FPCMADE=fpcmade.dos'#010+ - 'ZIPSUFFIX=go32'#010, + 'ZIP','SUFFIX=go32'#010+ 'endif'#010+ #010+ '# watcom'#010+ @@ -980,7 +979,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# FreeBSD'#010+ - 'ifeq ($(OS_TA','RGET),freebsd)'#010+ + 'i','feq ($(OS_TARGET),freebsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -997,8 +996,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ZIPSUFFIX=netbsd'#010+ 'endif'#010+ #010+ - '# OpenBSD'#010+ - 'ifeq ($(OS_','TARGET),openbsd)'#010+ + '# OpenBSD',#010+ + 'ifeq ($(OS_TARGET),openbsd)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ @@ -1014,8 +1013,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'SMARTEXT=.slw'#010+ 'STATICLIBEXT=.aw'#010+ 'SHAREDLIBEXT=.dll'#010+ - 'FPCMADE=fpcmade.w32'#010+ - 'ZIP','SUFFIX=w32'#010+ + 'FPCMADE=fpc','made.w32'#010+ + 'ZIPSUFFIX=w32'#010+ 'endif'#010+ #010+ '# OS/2'#010+ @@ -1033,9 +1032,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ZIPSUFFIX=emx'#010+ 'ECHO=echo'#010+ 'endif'#010+ - #010+ + #010, '# Amiga'#010+ - 'ifeq',' ($(OS_TARGET),amiga)'#010+ + 'ifeq ($(OS_TARGET),amiga)'#010+ 'EXEEXT='#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.asm'#010+ @@ -1052,8 +1051,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ - 'STATICLIBEXT=.a'#010+ - 'EXEEXT=','.ttp'#010+ + 'STATICLIBEX','T=.a'#010+ + 'EXEEXT=.ttp'#010+ 'FPCMADE=fpcmade.ata'#010+ 'endif'#010+ #010+ @@ -1072,8 +1071,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Solaris'#010+ 'ifeq ($(OS_TARGET),sunos)'#010+ - 'BATCHEXT=.sh'#010+ - 'PPUEXT=.','ppu'#010+ + 'BATCHEXT=','.sh'#010+ + 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ @@ -1092,8 +1091,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ - 'FPCMADE=fpcmade.qnx'#010+ - 'ZIPSUFFIX=','qnx'#010+ + 'FPCMADE=fpcmade.qn','x'#010+ + 'ZIPSUFFIX=qnx'#010+ 'endif'#010+ #010+ '# Netware'#010+ @@ -1111,8 +1110,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# Netware libc'#010+ - 'ifeq ($(OS_TARGET),netwlibc)'#010+ - 'ST','ATICLIBPREFIX='#010+ + 'ifeq ($(OS_TARGET),','netwlibc)'#010+ + 'STATICLIBPREFIX='#010+ 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ 'ASMEXT=.s'#010+ @@ -1130,8 +1129,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ - 'SMARTEXT=.sl'#010+ - 'STATICLI','BEXT=.a'#010+ + 'SMARTEXT=','.sl'#010+ + 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ 'DEBUGSYMEXT=.xcoff'#010+ 'FPCMADE=fpcmade.macos'#010+ @@ -1143,7 +1142,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '[defaulttools]'#010+ '#####################################################################'#010+ '# Default Tools'#010+ - '###################################','#################################'+ + '#######################','#############################################'+ '#'#010+ #010+ '# Names of the binutils tools'#010+ @@ -1152,7 +1151,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ARNAME=$(BINUTILSPREFIX)ar'#010+ 'RCNAME=$(BINUTILSPREFIX)rc'#010+ 'ifneq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ - 'ifeq ($(OS_TARGET),win3','2)'#010+ + 'ifeq ($(OS_','TARGET),win32)'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ 'ASNAME=asw'#010+ 'LDNAME=ldw'#010+ @@ -1168,9 +1167,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'else'#010+ 'ASPROG=$(ASNAME)'#010+ 'endif'#010+ - 'endif'#010+ + 'en','dif'#010+ #010+ - '# linke','r, but probably not used'#010+ + '# linker, but probably not used'#010+ 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ @@ -1182,9 +1181,9 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Resource compiler'#010+ 'ifndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ + 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEE','XT)'#010+ 'else'#010+ - 'RCP','ROG=$(RCNAME)'#010+ + 'RCPROG=$(RCNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1203,7 +1202,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'RC=$(RCPROG)'#010+ 'AR=$(ARPROG)'#010+ #010+ - '# ppas.bat / ppas.','sh'#010+ + '# ppas','.bat / ppas.sh'#010+ 'PPAS=ppas$(SRCBATCHEXT)'#010+ #010+ '# ldconfig to rebuild .so cache'#010+ @@ -1219,7 +1218,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'DATESTR='#010+ 'endif'#010+ #010+ - '# Look if UPX is found for go32v2 and win32. We can'#039't use $UP','X b'+ + '# Look if UPX is found for go32v2 and win32. We c','an'#039't use $UPX b'+ 'ecuase'#010+ '# upx uses that one itself (PFV)'#010+ 'ifndef UPXPROG'#010+ @@ -1230,9 +1229,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'UPXPROG:=1'#010+ 'endif'#010+ 'ifdef UPXPROG'#010+ - 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+ - ')))'#010+ - 'ifeq ($','(UPXPROG),)'#010+ + 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH', + '))))'#010+ + 'ifeq ($(UPXPROG),)'#010+ 'UPXPROG='#010+ 'else'#010+ 'UPXPROG:=$(firstword $(UPXPROG))'#010+ @@ -1253,8 +1252,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'TAREXT=.tar.bz2'#010+ 'else'#010+ 'TAROPT=vz'#010+ - 'TAREXT=.tar.gz'#010+ - 'endif',#010+ + 'TAREXT=.','tar.gz'#010+ + 'endif'#010+ #010+ #010+ '[command_begin]'#010+ @@ -1262,7 +1261,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load commandline OPTDEF and add FPC_CPU define, for co','mpiling the'#010+ + '# Load commandline OPTDEF and add FPC_CPU de','fine, for compiling the'#010+ '# compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ 'override FPCOPTDEF=$(CPU_TARGET)'#010+ @@ -1271,8 +1270,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ - 'override FPCOPT+=-T$(OS_TARGET)'#010+ - 'endi','f'#010+ + 'override FPCOPT+=-T$(OS_','TARGET)'#010+ + 'endif'#010+ #010+ 'ifeq ($(OS_SOURCE),openbsd)'#010+ 'override FPCOPT+=-FD$(NEW_BINUTILS_PATH)'#010+ @@ -1283,8 +1282,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc'#010+ 'endif'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ - 'endi','f'#010+ + 'override FPCOPT+=-Xr$(RLI','NKPATH)'#010+ + 'endif'#010+ 'endif'#010+ #010+ '# User dirs should be first, so they are looked at first'#010+ @@ -1295,7 +1294,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,','$(OBJDIR))'#010+ + 'override FPCOPT+=$(ad','dprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ @@ -1312,8 +1311,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# Debug'#010+ - 'ifdef DEBUG'#010+ - 'override F','PCOPT+=-gl'#010+ + 'ifdef DEBU','G'#010+ + 'override FPCOPT+=-gl'#010+ 'override FPCOPTDEF+=DEBUG'#010+ 'endif'#010+ #010+ @@ -1326,9 +1325,9 @@ const fpcmakeini : array[0..201,1..240] of char=( 'FPCCPUOPT:=-O1'#010+ 'else'#010+ 'FPCCPUOPT:='#010+ + 'endi','f'#010+ 'endif'#010+ - 'endif'#010+ - 'over','ride FPCOPT+=-Xs $(FPCCPUOPT) -n'#010+ + 'override FPCOPT+=-Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ 'endif'#010+ #010+ @@ -1344,7 +1343,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Verbose sett','ings (warning,note,info)'#010+ + '# ','Verbose settings (warning,note,info)'#010+ 'ifdef VERBOSE'#010+ 'override FPCOPT+=-vwni'#010+ 'endif'#010+ @@ -1354,8 +1353,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ - 'en','dif'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_','UNITDIR))'#010+ + 'endif'#010+ 'ifdef COMPILER_LIBRARYDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ @@ -1363,7 +1362,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ - 'override FPCOPT+=$(addprefix -Fi,$','(COMPILER_INCLUDEDIR))'#010+ + 'override FPCOPT+=$(add','prefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ 'endif'#010+ #010+ '# Cross compiler utils'#010+ @@ -1373,8 +1372,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Target dirs and the prefix to use for clean/install'#010+ 'ifdef COMPILER_TARGETDIR'#010+ - 'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+ - 'ifeq (','$(COMPILER_TARGETDIR),.)'#010+ + 'override FPCOPT+=-FE$(COMPILER_TARGE','TDIR)'#010+ + 'ifeq ($(COMPILER_TARGETDIR),.)'#010+ 'override TARGETDIRPREFIX='#010+ 'else'#010+ 'override TARGETDIRPREFIX=$(COMPILER_TARGETDIR)/'#010+ @@ -1383,7 +1382,7 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Unit target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ - 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010, + 'override FPCOPT+=-FU$(COMPILER_UNI','TTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ @@ -1392,7 +1391,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'else'#010+ 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ - 'override UNITTARGETDIRPR','EFIX=$(TARGETDIRPREFIX)'#010+ + 'override UNI','TTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1404,8 +1403,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '[command_libc]'#010+ - '# Add GCC lib path if asked'#010+ - 'i','fdef GCCLIBDIR'#010+ + '# Add GCC lib pat','h if asked'#010+ + 'ifdef GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ 'ifdef OTHERLIBDIR'#010+ @@ -1416,10 +1415,10 @@ const fpcmakeini : array[0..201,1..240] of char=( '[command_end]'#010+ '# Add commandline options last so they can override'#010+ 'ifdef OPT'#010+ - 'override FPCOPT+=$(OPT)'#010+ + 'override FPCOPT+=$(OPT)',#010+ 'endif'#010+ #010+ - '# Ad','d defines from FPCOPTDEF to FPCOPT'#010+ + '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ 'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+ 'endif'#010+ @@ -1429,8 +1428,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override FPCOPT+=@$(CFGFILE)'#010+ 'endif'#010+ #010+ - '# Use the environment to pass commandline options?'#010+ - 'ifd','ef USEENV'#010+ + '# Use the environment to pass commandline ','options?'#010+ + 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ 'export FPCEXTCMD'#010+ @@ -1440,7 +1439,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ '# also call ppas if with command option -s'#010+ - '# but only if the FULL_SOURCE and FULL_TARGET',' are equal'#010+ + '# but only if the FULL_SOURCE and',' FULL_TARGET are equal'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ @@ -1452,9 +1451,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '[loaderrules]'#010+ '#####################################################################'#010+ - '# Loaders'#010+ - '############','########################################################'+ - '#'#010+ + '# Loaders'#010, + '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ @@ -1463,7 +1461,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ - 'override LOADERO','FILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ + 'over','ride LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ @@ -1473,7 +1471,7 @@ const fpcmakeini : array[0..201,1..240] of char=( ' $(AS) -o $*$(OEXT) $<'#010+ 'endif'#010+ #010+ - 'fpc_loaders: $(COMPILER_UNITTARGETDI','R) $(LOADEROFILES)'#010+ + 'fpc_loaders: $(COMPILER_','UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_clean:'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ @@ -1484,7 +1482,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ 'fpc_loaders_install:'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)',#010+ + ' $(MKDIR) $(INST','ALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#010+ @@ -1494,7 +1492,7 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ #010+ '[unitrules]'#010+ - '#####################################','###############################'+ + '#########################','###########################################'+ '#'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -1504,14 +1502,14 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifneq ($(TARGET_UNITS),)'#010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_','UNITS))'#010+ + 'override UNITPPUFILES=$(addsuffix $(PPUEX','T),$(TARGET_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: $(COMPI','LER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ + 'fpc_un','its: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ #010+ #010+ '[exerules]'#010+ @@ -1521,19 +1519,19 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '.PHONY: fpc_exes'#010+ #010+ - '# Programs are not needed ','for a cross installation'#010+ + '# Programs are',' not needed for a cross installation'#010+ 'ifndef CROSSINSTALL'#010+ 'ifneq ($(TARGET_PROGRAMS),)'#010+ 'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+ 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+ - 'x $(STATICLIBPREFIX),$(addsuffix $(ST','ATICLIBEXT),$(TARGET_PROGRAMS))'+ + 'x $(STATICLIBPREFIX),$(ad','dsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ ')'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))',#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGE','T_PROGRAMS))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+ @@ -1545,7 +1543,7 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ #010+ '[rstrules]'#010+ - '########################################','############################'+ + '############################','########################################'+ '#'#010+ '# Resource strings'#010+ '#####################################################################'#010+ @@ -1553,11 +1551,11 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ - 'override CLEANRSTFILES+=$(RSTFILES)'#010+ + 'override CLEANRSTFILES+=$(RSTFILE','S)'#010+ 'endif'#010+ #010+ #010+ - '[','examplerules]'#010+ + '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ '#####################################################################'#010+ @@ -1565,18 +1563,18 @@ const fpcmakeini : array[0..201,1..240] of char=( '.PHONY: fpc_examples'#010+ #010+ 'ifneq ($(TARGET_EXAMPLES),)'#010+ - 'HASEXAMPLES=1'#010+ - 'override E','XAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXA'+ - 'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET'+ - '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ - 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES','))'#010+ + 'HASEXAMPLES=','1'#010+ + 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ + 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_E'+ + 'XAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TAR','GET_EXAMPLES))'#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+ - 'override CL','EANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ + 'ifeq ($(OS_TARGET),os2)',#010+ + 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ @@ -1586,16 +1584,17 @@ const fpcmakeini : array[0..201,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXA','MPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ + 'fpc_example','s: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLED'+ 'IRS))'#010+ #010+ #010+ '[compilerules]'#010+ '#####################################################################'#010+ '# General compile rules'#010+ - '#####################################################################'#010+ + '##################################################################','##'+ + '#'#010+ #010+ - '.PHONY:',' fpc_all fpc_smart fpc_debug fpc_release'#010+ + '.PHONY: fpc_all fpc_smart fpc_debug fpc_release'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1606,7 +1605,7 @@ const fpcmakeini : array[0..201,1..240] of char=( ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_debug:'#010+ - ' $(MAKE) all',' DEBUG=1'#010+ + ' ',' $(MAKE) all DEBUG=1'#010+ #010+ 'fpc_release:'#010+ ' $(MAKE) all RELEASE=1'#010+ @@ -1617,7 +1616,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ - ' $(MKD','IRTREE) $(COMPILER_UNITTARGETDIR)'#010+ + ' ',' $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ @@ -1630,7 +1629,7 @@ const fpcmakeini : array[0..201,1..240] of char=( ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ - '%$(EXEEXT): %.p','p '#010+ + '%$(','EXEEXT): %.pp '#010+ ' $(COMPILER) $<'#010+ ' $(EXECPPAS)'#010+ #010+ @@ -1644,22 +1643,23 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '%$(EXEEXT): %.dpr'#010+ ' $(COMPILER) $<'#010+ - ' $(EXECPPAS)'#010+ + ' $(EXECPP','AS)'#010+ #010+ - '%.res: ','%.rc'#010+ + '%.res: %.rc'#010+ ' windres -i $< -o $@'#010+ #010+ '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+ 'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ - 'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_I','NCLUDEDIR)'#010+ + 'vpath %.lpr $(COMPILER_SOURCEDIR) ','$(COMPILER_INCLUDEDIR)'#010+ 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[libraryrules]'#010+ - '#####################################################################'#010+ - '# ','Library'#010+ + '############################################################','########'+ + '#'#010+ + '# Library'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_shared'#010+ @@ -1672,7 +1672,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Default sharedlib ','units are all unit objects'#010+ + '# Defaul','t sharedlib units are all unit objects'#010+ 'ifndef LIB_SHAREDUNITS'#010+ 'LIB_SHAREDUNITS:=$(TARGET_UNITS)'#010+ 'endif'#010+ @@ -1681,8 +1681,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifdef HASSHAREDLIB'#010+ ' $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FULLNAME)'#010+ 'else'#010+ - ' @$(ECHO) Shared Libraries not supported'#010+ - 'endif'#010, + ' @$(ECHO) Shared Libraries not supp','orted'#010+ + 'endif'#010+ #010+ #010+ '[installrules]'#010+ @@ -1690,9 +1690,9 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Install rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ + '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinsta','ll'#010+ #010+ - 'ifdef IN','STALL_UNITS'#010+ + 'ifdef INSTALL_UNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ 'endif'#010+ #010+ @@ -1702,19 +1702,19 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ - 'override INST','ALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ + 'o','verride INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ 'FILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES)))'#010+ 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALL'+ - 'PPUFILES))'#010+ - 'override I','NSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIR'+ - 'PREFIX),$(INSTALLPPULINKFILES)))'#010+ + 'PPUFILES)',')'#010+ + 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ + 'EFIX),$(INSTALLPPULINKFILES)))'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ 'endif'#010+ #010+ 'ifdef INSTALLEXEFILES'#010+ - 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPR','EFIX),$(INSTALLEX'+ + 'override INSTALLEXEFILES:=$(addprefix $','(TARGETDIRPREFIX),$(INSTALLEX'+ 'EFILES))'#010+ 'endif'#010+ #010+ @@ -1725,14 +1725,14 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifdef UPXPROG'#010+ ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ 'endif'#010+ - ' $(INSTALLEX','E) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ + ' ',' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+ 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ '# If the fpcpackage variable is set then create and install Package.fp'+ 'c,'#010+ '# a safety check is done if Makefile.fpc is available'#010+ - 'ifdef PACKAGE_VERSION'#010, + 'ifdef PACK','AGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ @@ -1742,13 +1742,13 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ - ' $(MKDIR) $(INSTA','LL_UNITDIR)'#010+ + ' $(MK','DIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ - ' $(MKDIR) $(INSTALL_LIBDIR)'#010, + ' $(MKDIR) $(INST','ALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+ @@ -1757,7 +1757,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_FILES'#010+ ' $(MKDIR) $(INSTALL_DATADIR)'#010+ - ' $(INSTALL) $(INSTALL_FILES) $(I','NSTALL_DATADIR)'#010+ + ' $(INSTALL) $(INSTAL','L_FILES) $(INSTALL_DATADIR)'#010+ 'endif'#010+ #010+ 'fpc_sourceinstall: distclean'#010+ @@ -1765,35 +1765,35 @@ const fpcmakeini : array[0..201,1..240] of char=( ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ - 'ifdef HASEXAMPLES'#010+ - ' $(M','KDIR) $(INSTALL_EXAMPLEDIR)'#010+ + 'ifdef HASEXAMPLES',#010+ + ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ - 'AMPLEDIR)'#010+ + 'AMPLEDIR',')'#010+ 'endif'#010+ #010+ - '[di','stinstallrules]'#010+ + '[distinstallrules]'#010+ '#####################################################################'#010+ '# Dist Install'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_distinstall'#010+ #010+ - 'fpc_distinstall: install exampleinstall'#010+ + 'fpc_distinstall: install exampl','einstall'#010+ #010+ #010+ - '[','zipinstallrules]'#010+ + '[zipinstallrules]'#010+ '#####################################################################'#010+ '# Zip'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+ + '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstal','l'#010+ #010+ - '# Tempora','ry path to pack a file, can only use a single deep'#010+ + '# Temporary path to pack a file, can only use a single deep'#010+ '# subdir, because the deltree can'#039't see the whole tree to remove'#010+ 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ @@ -1803,7 +1803,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Maybe create default z','ipname from packagename'#010+ + '# Maybe crea','te default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ @@ -1816,8 +1816,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifndef ZIPTARGET'#010+ 'ifdef DIST_ZIPTARGET'#010+ 'ZIPTARGET=DIST_ZIPTARGET'#010+ - 'else'#010+ - 'ZIPTARGET=in','stall'#010+ + 'else'#010, + 'ZIPTARGET=install'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1833,8 +1833,8 @@ const fpcmakeini : array[0..201,1..240] of char=( 'USEZIPWRAPPER=1'#010+ 'endif'#010+ #010+ - '# We need to be able to run in the current OS so fix'#010+ - '# the ','path separator'#010+ + '# We need to be able to run in the current OS s','o fix'#010+ + '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ 'ZIPPATHSEP=$(PATHSEP)'#010+ 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ @@ -1843,37 +1843,37 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ - 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$','(PACKDIR))'#010+ + 'ZIPCMD_CDPACK:=cd $(subst /,$(Z','IPPATHSEP),$(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+ - 'ZIPCMD_','ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+ - 'ESTFILE) *'#010+ + 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIP','EXT)'#010+ + 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+ + 'TFILE) *'#010+ 'endif'#010+ #010+ 'fpc_zipinstall:'#010+ ' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+ ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ - 'ifdef USEZIPWR','APPER'#010+ + 'if','def 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))" >> $(ZIPWRAPPER)'+ - #010+ - ' $','(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRA'+ - 'PPER)'#010+ + ' $(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) >> $(ZIPWRAPPER)'#010+ 'endif'#010+ 'ifdef inUnix'#010+ - ' /bin/s','h $(ZIPWRAPPER)'#010+ + ' ',' /bin/sh $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPWRAPPER)'#010+ 'endif'#010+ @@ -1884,7 +1884,7 @@ const fpcmakeini : array[0..201,1..240] of char=( ' $(DELTREE) $(PACKDIR)'#010+ #010+ 'fpc_zipsourceinstall:'#010+ - ' $(MAKE) fpc_zipinstall ZIPTARG','ET=sourceinstall ZIPSUFFIX=src'+ + ' $(MAKE) fpc_zipins','tall ZIPTARGET=sourceinstall ZIPSUFFIX=src'+ #010+ #010+ 'fpc_zipexampleinstall:'#010+ @@ -1896,16 +1896,15 @@ const fpcmakeini : array[0..201,1..240] of char=( ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+ #010+ #010+ - '[cleanrules]'#010+ - '##','##################################################################'+ - '#'#010+ + '[cl','eanrules]'#010+ + '#####################################################################'#010+ '# Clean rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(','addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ + 'override CLEAN','EXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ 'ES))'#010+ 'endif'#010+ #010+ @@ -1914,14 +1913,14 @@ const fpcmakeini : array[0..201,1..240] of char=( 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ - 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(addpr','efix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ + 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFIL','E'+ + 'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ '(CLEANPPUFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ 'UFILES))'#010+ 'endif'#010+ - 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$','(CLEANPP'+ + 'override CLEANPPUFILES:=$(addprefix $(UNITTARGET','DIRPREFIX),$(CLEANPP'+ 'UFILES))'#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ 'IX),$(CLEANPPULINKFILES)))'#010+ @@ -1932,7 +1931,7 @@ const fpcmakeini : array[0..201,1..240] of char=( ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ - ' -$(DEL',') $(CLEANPPUFILES)'#010+ + ' ',' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ @@ -1941,7 +1940,7 @@ const fpcmakeini : array[0..201,1..240] of char=( ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ - ' -$(DEL) $(CLEAN_FILES',')'#010+ + ' -$(DEL) $','(CLEAN_FILES)'#010+ 'endif'#010+ 'ifdef LIB_NAME'#010+ ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ @@ -1950,7 +1949,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'PCEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ #010+ - 'fpc_cleanall: $(CLEANTARGET',')'#010+ + 'fpc_cleanall: $','(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ @@ -1961,24 +1960,24 @@ const fpcmakeini : array[0..201,1..240] of char=( 'ifneq ($(CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ - 'ifdef CLEANRSTFILE','S'#010+ + 'ifdef ','CLEANRSTFILES'#010+ ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+ 'endif'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ - 'ifneq ($(PPUEXT),.ppu)'#010+ - ' ',' -$(DEL) *.o *.ppu *.a'#010+ + 'ifneq ($(PPUEXT)',',.ppu)'#010+ + ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+ 'CEXTFILE) $(REDIRFILE)'#010+ ' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ - ' -$(DEL) *$(AOUTEXT)'#010+ + ' -$(DEL) *$(AOUT','EXT)'#010+ 'endif'#010+ - 'i','fdef DEBUGSYMEXT'#010+ + 'ifdef DEBUGSYMEXT'#010+ ' -$(DEL) *$(DEBUGSYMEXT)'#010+ 'endif'#010+ #010+ @@ -1988,7 +1987,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '[baseinforules]'#010+ '#####################################################################'#010+ '# Base info rules'#010+ - '######################################################','##############'+ + '##########################################','##########################'+ '#'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ @@ -1999,32 +1998,32 @@ const fpcmakeini : array[0..201,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ ' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+ - ' @$(ECHO) Package Version.. $(PACKAGE_V','ERSION)'#010+ + ' @$(ECHO) Package Version..',' $(PACKAGE_VERSION)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) FPC.......... $(FPC)'#010+ ' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+ ' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+ - ' @$(ECHO) Targe','t CPU... $(CPU_TARGET)'#010+ + ' @$(','ECHO) Target CPU... $(CPU_TARGET)'#010+ ' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+ ' @$(ECHO) Target OS.... $(OS_TARGET)'#010+ ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO)',' == Directory info =='#010+ + ' ',' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ - ' @$(ECHO) CrossBinDir..... $(','CROSSBINDIR)'#010+ + ' @$(ECHO) CrossBi','nDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ ' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ - ' @$(ECHO',')'#010+ + ' ',' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) As........ $(AS)'#010+ @@ -2032,57 +2031,58 @@ const fpcmakeini : array[0..201,1..240] of char=( ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Mv........ ','$(MVPROG)'#010+ + ' @$(ECHO) ',' Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ ' @$(ECHO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ - ' @$(ECHO) Date...... $(DATE)',#010+ + ' @$(ECHO) Date..','.... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Object info =='#010+ - ' @$(ECHO)'#010+ - ' @','$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ + ' @$(ECH','O)'#010+ + ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+ ' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ - ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ - ' ','@$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ + ' @$(ECHO) Target Programs....... $(TARGET_PROGRA','MS)'#010+ + ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ ' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+ ' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Clean Units......... $(CLEAN_UNITS',')'#010+ + ' @$(ECHO) Clean Units......... $','(CLEAN_UNITS)'#010+ ' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+ ' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Install info =='#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO) == Insta','ll info =='#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ - ' ',' @$(ECHO)'#010+ + ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPA','CKAGE)'#010+ + ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ ' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+ - ' @$(ECHO) Install units dir.... $(INSTALL_UNI','TDIR)'#010+ + ' @$(ECHO) Install units dir.... $','(INSTALL_UNITDIR)'#010+ ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+ ' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ - ' @$(ECHO) Install data dir..... $(INSTALL_DAT','ADIR)'#010+ + ' @$(ECHO) Install data dir..... $','(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[inforules]'#010+ - '#####################################################################'#010+ - '# Inf','o rules'#010+ + '###############################################################','#####'+ + '#'#010+ + '# Info rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_info'#010+ @@ -2092,7 +2092,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '[makefilerules]'#010+ '#####################################################################'#010+ '# Rebuild Makefile'#010+ - '##############','######################################################'+ + '##','##################################################################'+ '#'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ @@ -2102,7 +2102,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'fpc_makefile:'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ - 'fpc_makefile_sub1:',#010+ + 'fpc_ma','kefile_sub1:'#010+ 'ifdef TARGET_DIRS'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+ 'T_DIRS))'#010+ @@ -2112,7 +2112,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'T_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ - 'fpc_makefile_sub2:',' $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+ + 'fpc_ma','kefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGE'+ 'T_EXAMPLEDIRS))'#010+ #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ @@ -2120,7 +2120,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ - '######################################################','##############'+ + '##########################################','##########################'+ '#'#010+ '# Local Makefile'#010+ '#####################################################################'#010+ @@ -2131,7 +2131,7 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ #010+ '[userrules]'#010+ - '###############################################################','#####'+ + '###################################################','#################'+ '#'#010+ '# Users rules'#010+ '#####################################################################'#010+ @@ -2139,7 +2139,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '[lclrules]'#010+ '#####################################################################'#010+ '# LCL Rules'#010+ - '#######################################################','#############'+ + '###########################################','#########################'+ '#'#010+ #010+ '# LCL Platform'#010+ @@ -2154,7 +2154,7 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ - 'override LCLDIR:=$(subst \,/,$(LC','LDIR))'#010+ + 'override LCLDIR:=$(su','bst \,/,$(LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2164,8 +2164,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ - 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ - 'ifeq ($(w','ildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ + 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR','))'#010+ + 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ @@ -2173,7 +2173,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '# 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+ + ' $(addsuffix /units/$(LCL','_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2182,7 +2182,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '# 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+ + ' $(addsuffix /lib/lazarus','/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ @@ -2191,7 +2191,7 @@ const fpcmakeini : array[0..201,1..240] of char=( '# Generate dirs'#010+ 'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+ 'IR)/units)'#010+ - 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)','/../compo'+ + 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/','.. $(LCLDIR)/../compo'+ 'nents $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ @@ -2200,7 +2200,7 @@ const fpcmakeini : array[0..201,1..240] of char=( 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ - '###############################','#####################################'+ + '###################','#################################################'+ '#'#010+ '# LCL Info rules'#010+ '#####################################################################'#010+ @@ -2210,8 +2210,8 @@ const fpcmakeini : array[0..201,1..240] of char=( #010+ 'lclinfo:'#010+ ' @$(ECHO) == LCL info =='#010+ - ' @$(ECHO)'#010+ - ' @','$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ + ' @$(ECH','O)'#010+ + ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ ' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+ ' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+ diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini index 523986fba9..18166b1bc8 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -10,7 +10,7 @@ # OS categories BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) sunos qnx -LIMIT83fs = go32v2 os2 +LIMIT83fs = go32v2 os2 emx watcom #Empty target for rules that always should run. Needed if #the target is non-phoney, and there is non-phony prereqisites. @@ -895,7 +895,7 @@ endif # Generate fpcmade., use for 8.3 limited OS's the short extension # Otherwise use the full name ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) -FPCMADE=fpcmade$(FPCMADEEXT) +FPCMADE=fpcmade.$(FPCMADEEXT) else FPCMADE=fpcmade.$(FULL_TARGET) endif