From 3eaece1399a131c184681e45be7ca67e4390ff24 Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 25 Feb 2007 21:32:02 +0000 Subject: [PATCH] * packagesdir git-svn-id: trunk@6659 - --- utils/fpcm/fpcmake.inc | 562 +++++++++++++++++++++-------------------- utils/fpcm/fpcmake.ini | 2 +- 2 files changed, 284 insertions(+), 280 deletions(-) diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc index d8defa0e27..0e5ea324f8 100644 --- a/utils/fpcm/fpcmake.inc +++ b/utils/fpcm/fpcmake.inc @@ -370,14 +370,14 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# Packages dir'#010+ - 'P','ACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/'+ - 'packages/extra)'#010+ + 'P','ACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packa'+ + 'ges/base $(FPCDIR)/packages/extra)'#010+ #010+ #010+ '[shelltools]'#010+ '#####################################################################'#010+ '# Shell tools'#010+ - '##########################################################','##########'+ + '#######################################','#############################'+ '#'#010+ #010+ '# Echo that can redir (must be able run in the default OS shell)'#010+ @@ -394,8 +394,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'COPY:=$(CPPROG) -fp'#010+ 'endif'#010+ #010+ - '# Copy a whole tree'#010+ - 'ifn','def COPYTREE'#010+ + '# Co','py a whole tree'#010+ + 'ifndef COPYTREE'#010+ 'COPYTREE:=$(CPPROG) -Rfp'#010+ 'endif'#010+ #010+ @@ -411,10 +411,10 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# Check delete program'#010+ 'ifndef DEL'#010+ - 'DEL:=$(RMPROG) -f'#010+ + 'DEL:=$(RMPROG) ','-f'#010+ 'endif'#010+ #010+ - '# Check d','eltree program'#010+ + '# Check deltree program'#010+ 'ifndef DELTREE'#010+ 'DELTREE:=$(RMPROG) -rf'#010+ 'endif'#010+ @@ -430,8 +430,8 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ - 'ifdef inUnix'#010+ - 'INSTALLEXE:=$(','GINSTALL) -c -m 755'#010+ + 'ifdef in','Unix'#010+ + 'INSTALLEXE:=$(GINSTALL) -c -m 755'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ 'endif'#010+ @@ -447,7 +447,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[defaultdirs]'#010+ - '#####################','###############################################'+ + '##','##################################################################'+ '#'#010+ '# Default Directories'#010+ '#####################################################################'#010+ @@ -455,10 +455,10 @@ const fpcmakeini : array[0..213,1..240] of char=( '# Units dir'#010+ 'ifdef REQUIRE_UNITSDIR'#010+ 'override UNITSDIR+=$(REQUIRE_UNITSDIR)'#010+ - 'endif'#010+ + 'endif',#010+ #010+ '# Units dir'#010+ - 'ifdef',' REQUIRE_PACKAGESDIR'#010+ + 'ifdef REQUIRE_PACKAGESDIR'#010+ 'override PACKAGESDIR+=$(REQUIRE_PACKAGESDIR)'#010+ 'endif'#010+ #010+ @@ -466,8 +466,8 @@ const fpcmakeini : array[0..213,1..240] of char=( '# 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+ - '# Zi','pinstall'#010+ + 'if','def ZIPINSTALL'#010+ + '# Zipinstall'#010+ 'ifneq ($(findstring $(OS_TARGET),$(UNIXs)),)'#010+ 'UNIXHier=1'#010+ 'endif'#010+ @@ -479,8 +479,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# When install prefix is not set try to use prefix'#010+ - 'ifndef INSTALL_PREFIX'#010+ - 'ifdef',' PREFIX'#010+ + 'ifndef I','NSTALL_PREFIX'#010+ + 'ifdef PREFIX'#010+ 'INSTALL_PREFIX=$(PREFIX)'#010+ 'endif'#010+ 'endif'#010+ @@ -493,7 +493,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=/pp'#010+ 'else'#010+ - 'INSTALL_BASEDIR:=/$(','PACKAGE_NAME)'#010+ + 'I','NSTALL_BASEDIR:=/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -505,7 +505,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'export INSTALL_FPCSUBDIR'#010+ 'endif'#010+ #010+ - '# Where to place the resulting zip files'#010, + '# Where to place the r','esulting zip files'#010+ 'ifndef DIST_DESTDIR'#010+ 'DIST_DESTDIR:=$(BASEDIR)'#010+ 'endif'#010+ @@ -515,8 +515,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifndef COMPILER_UNITTARGETDIR'#010+ 'ifdef PACKAGEDIR_MAIN'#010+ 'COMPILER_UNITTARGETDIR=$(PACKAGEDIR_MAIN)/units/$(TARGETSUFFIX)'#010+ - 'else'#010+ - 'COMPILER_UNITTARGE','TDIR=units/$(TARGETSUFFIX)'#010+ + 'else',#010+ + 'COMPILER_UNITTARGETDIR=units/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ 'ifndef COMPILER_TARGETDIR'#010+ @@ -526,7 +526,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '#####################################################################'#010+ '# Install Directories'#010+ - '######################################################','##############'+ + '###################################','#################################'+ '#'#010+ #010+ '# set the base directory where to install everything'#010+ @@ -535,7 +535,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ - 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/$(PAC','KAGE_NAME)'#010+ + 'INSTALL_BASEDIR:=$(INSTAL','L_PREFIX)/lib/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+ @@ -547,16 +547,16 @@ const fpcmakeini : array[0..213,1..240] of char=( '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+ + 'INSTALL_BINDIR:=$(INS','TALL_BASEDIR)/bin'#010+ + '# for FPC packages install the binaries under their target subdir'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ 'ifdef CROSSCOMPILE'#010+ 'ifdef CROSSINSTALL'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(SOURCESUFFIX)'#010+ 'else'#010+ - 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ + 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TA','RGETSUFFIX)'#010+ 'endif'#010+ - 'e','lse'#010+ + 'else'#010+ 'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(TARGETSUFFIX)'#010+ 'endif'#010+ 'endif'#010+ @@ -566,8 +566,8 @@ const fpcmakeini : array[0..213,1..240] of char=( '# set the directory where to install the units.'#010+ 'ifndef INSTALL_UNITDIR'#010+ 'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(TARGETSUFFIX)'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ - 'ifdef P','ACKAGE_NAME'#010+ + 'ifdef INSTALL','_FPCPACKAGE'#010+ + 'ifdef PACKAGE_NAME'#010+ 'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'endif'#010+ @@ -578,8 +578,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef UNIXHier'#010+ 'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+ 'else'#010+ - 'INSTALL_LIBDIR:=$(INSTALL_UNITDIR)'#010+ - 'endif'#010, + 'INSTALL_LIBDIR:=$(INST','ALL_UNITDIR)'#010+ + 'endif'#010+ 'endif'#010+ #010+ '# Where the source files will be stored'#010+ @@ -594,17 +594,17 @@ const fpcmakeini : array[0..213,1..240] of char=( 'SRCPREFIXDIR=src'#010+ 'endif'#010+ 'endif'#010+ - 'ifdef INSTALL_FPCPACKAGE'#010+ - 'ifdef INSTALL','_FPCSUBDIR'#010+ + 'ifdef INSTALL_FPCPA','CKAGE'#010+ + 'ifdef INSTALL_FPCSUBDIR'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(INSTALL_FPCSUBDIR)/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/fpc-$(FPC_VERSION'+ ')/$(PACKAGE_NAME)'#010+ 'endif'#010+ - 'else'#010+ - 'INSTALL_SOURCEDI','R:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)'+ - '-$(PACKAGE_VERSION)'#010+ + 'el','se'#010+ + 'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/$(SRCPREFIXDIR)/$(PACKAGE_NAME)-$'+ + '(PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ 'ifdef INSTALL_FPCPACKAGE'#010+ @@ -612,7 +612,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_FPCSUBDIR)/$(PA'+ 'CKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_SOURCEDIR:=$(','INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ + 'IN','STALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)'#010+ 'endif'#010+ 'else'#010+ 'INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source'#010+ @@ -624,9 +624,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifndef INSTALL_DOCDIR'#010+ 'ifdef UNIXHier'#010+ 'ifdef BSDhier'#010+ - 'DOCPREFIXDIR=share/doc'#010+ + 'DOCPREFIXDIR=share','/doc'#010+ 'else'#010+ - 'ifdef lin','uxHier'#010+ + 'ifdef linuxHier'#010+ 'DOCPREFIXDIR=share/doc'#010+ 'else'#010+ 'DOCPREFIXDIR=doc'#010+ @@ -636,7 +636,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/fpc-$(FPC_VERSION)/$'+ '(PACKAGE_NAME)'#010+ 'else'#010+ - 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPREFIXDIR)/$(PACKAGE_N','AME)-$('+ + 'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/$(DOCPRE','FIXDIR)/$(PACKAGE_NAME)-$('+ 'PACKAGE_VERSION)'#010+ 'endif'#010+ 'else'#010+ @@ -648,7 +648,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Where to install the examples, under linux we use the doc di','r'#010+ + '# Where to install the examples, under linu','x we use the doc dir'#010+ '# because the copytree command will create a subdir itself'#010+ 'ifndef INSTALL_EXAMPLEDIR'#010+ 'ifdef UNIXHier'#010+ @@ -656,9 +656,9 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'ifdef BSDhier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/fpc-$(FPC_VERSION'+ - ')/$(PACKAGE_NAME)'#010+ + ')/$(PACKA','GE_NAME)'#010+ 'else'#010+ - 'ifdef',' linuxHier'#010+ + 'ifdef linuxHier'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_DOCDIR)/examples'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+ @@ -669,7 +669,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'else'#010+ #010+ 'ifdef BSDhier'#010+ - 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/share/examples/$(PAC','KAGE_NAME)'+ + 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/s','hare/examples/$(PACKAGE_NAME)'+ '-$(PACKAGE_VERSION)'#010+ 'else'#010+ 'ifdef linuxHier'#010+ @@ -678,12 +678,12 @@ const fpcmakeini : array[0..213,1..240] of char=( 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/$(PACKAGE_NAME)-$(PACKAGE_VE'+ 'RSION)'#010+ - 'endif'#010+ + 'endif'#010, #010+ 'endif'#010+ 'endif'#010+ 'else'#010+ - 'i','fdef INSTALL_FPCPACKAGE'#010+ + 'ifdef INSTALL_FPCPACKAGE'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+ 'else'#010+ 'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+ @@ -692,8 +692,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# Where the some extra (data)files will be stored'#010+ - 'ifndef INSTALL_DATADIR'#010+ - 'INSTALL','_DATADIR=$(INSTALL_BASEDIR)'#010+ + 'ifndef INST','ALL_DATADIR'#010+ + 'INSTALL_DATADIR=$(INSTALL_BASEDIR)'#010+ 'endif'#010+ #010+ 'ifndef INSTALL_SHAREDDIR'#010+ @@ -702,14 +702,14 @@ const fpcmakeini : array[0..213,1..240] of char=( #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'#010+ - '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+ - 'ifndef CROSSBI','NDIR'#010+ + '# is found use the targets/ subdir in INSTALL_BASE','DIR.'#010+ + 'ifndef CROSSBINDIR'#010+ 'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(SOURCESUFFIX))'#010+ 'ifeq ($(CROSSBINDIR),)'#010+ 'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(TARGETSUFFIX)/bin/$'+ @@ -721,8 +721,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ #010+ - '[dirlibc]'#010+ - '# On linux, try ','to find where libgcc.a is.'#010+ + '[dirlib','c]'#010+ + '# On linux, try to find where libgcc.a is.'#010+ 'ifeq ($(OS_SOURCE),linux)'#010+ #010+ '# Amd64 to i386?'#010+ @@ -730,7 +730,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifeq ($(CPU_TARGET),i386)'#010+ 'ifneq ($(findstring x86_64,$(shell uname -a)),)'#010+ 'ifeq ($(BINUTILSPREFIX),)'#010+ - 'GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-f','ile-name`)'#010+ + 'GCCLIBDIR:=$(shell dirname `gcc -','m32 -print-libgcc-file-name`)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -743,7 +743,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# Try cross gcc'#010+ 'ifndef GCCLIBDIR'#010+ - 'CROSSGCC=$(strip $(wildcard $(addsuffix',' /$(BINUTILSPREFIX)gcc$(SRCEX'+ + 'CROSSGCC=$(strip $(w','ildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEX'+ 'EEXT),$(SEARCHPATH))))'#010+ 'ifneq ($(CROSSGCC),)'#010+ 'GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)'#010+ @@ -752,7 +752,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# Other libraries from ld.so.conf'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBDIR:=$(shell grep -v "^\#" ','/etc/ld.so.conf | awk '#039'{ ORS='+ + 'OTHERLIBDIR:=$(s','hell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS='+ '" "; print $1 }'#039')'#010+ 'endif'#010+ 'endif'#010+ @@ -766,7 +766,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[extensions]'#010+ - '#############################################################','#######'+ + '##########################################','##########################'+ '#'#010+ '# Default extensions'#010+ '#####################################################################'#010+ @@ -778,9 +778,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'PPLEXT=.ppl'#010+ 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ - 'ASMEXT=.s'#010+ + 'ASMEX','T=.s'#010+ 'SMARTEXT=.sl'#010+ - 'S','TATICLIBEXT=.a'#010+ + 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.so'#010+ 'SHAREDLIBPREFIX=libfp'#010+ 'STATICLIBPREFIX=libp'#010+ @@ -789,7 +789,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '#DEBUGSYMEXT #for debugger symbol files, define only for targets which'+ ' has this'#010+ #010+ - '# 1.0.x has target specific extensions for ppu fi','les and objects'#010+ + '# 1.0.x has target specific ex','tensions 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+ #010+ @@ -800,8 +800,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# Go32v2'#010+ - 'ifeq ($(OS_TARGET),go32v2)'#010+ - 'STAT','ICLIBPREFIX='#010+ + 'ifeq ($(OS_T','ARGET),go32v2)'#010+ + 'STATICLIBPREFIX='#010+ 'SHORTSUFFIX=dos'#010+ 'endif'#010+ #010+ @@ -818,9 +818,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifeq ($(OS_TARGET),linux)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ - 'HASSHAREDLIB=1'#010+ + 'HASSHAREDLIB=1',#010+ 'SHORTSUFFIX=lnx'#010+ - 'en','dif'#010+ + 'endif'#010+ #010+ '# FreeBSD'#010+ 'ifeq ($(OS_TARGET),freebsd)'#010+ @@ -839,8 +839,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# OpenBSD'#010+ - 'ifeq ($(OS_TARGET),openbsd)'#010+ - 'BATCH','EXT=.sh'#010+ + 'ifeq ($(OS_TAR','GET),openbsd)'#010+ + 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=obs'#010+ @@ -857,9 +857,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'BATCHEXT=.cmd'#010+ 'AOUTEXT=.out'#010+ 'STATICLIBPREFIX='#010+ - 'SHAREDLIBEXT=.dll'#010+ + 'SHAREDLIBEXT=.dll',#010+ 'SHORTSUFFIX=os2'#010+ - 'EC','HO=echo'#010+ + 'ECHO=echo'#010+ 'endif'#010+ #010+ '# EMX'#010+ @@ -877,10 +877,10 @@ const fpcmakeini : array[0..213,1..240] of char=( 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=amg'#010+ - 'endif'#010+ + 'e','ndif'#010+ #010+ '# MorphOS'#010+ - 'ife','q ($(OS_TARGET),morphos)'#010+ + 'ifeq ($(OS_TARGET),morphos)'#010+ 'EXEEXT='#010+ 'SHAREDLIBEXT=.library'#010+ 'SHORTSUFFIX=mos'#010+ @@ -897,10 +897,10 @@ const fpcmakeini : array[0..213,1..240] of char=( 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=be'#010+ - 'endif'#010+ + 'endif'#010, #010+ '# Solaris'#010+ - 'ifeq ($(','OS_TARGET),solaris)'#010+ + 'ifeq ($(OS_TARGET),solaris)'#010+ 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=sun'#010+ @@ -917,10 +917,10 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifeq ($(OS_TARGET),netware)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ - 'SHORTSUFFIX=nw'#010+ + 'SHORTSUFFIX','=nw'#010+ 'endif'#010+ #010+ - '# Netwar','e libc'#010+ + '# Netware libc'#010+ 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'EXEEXT=.nlm'#010+ 'STATICLIBPREFIX='#010+ @@ -937,9 +937,9 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# Darwin'#010+ 'ifeq ($(OS_TARGET),darwin)'#010+ - 'BATCHEXT=.sh'#010+ + 'BAT','CHEXT=.sh'#010+ 'EXEEXT='#010+ - 'H','ASSHAREDLIB=1'#010+ + 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=dwn'#010+ 'endif'#010+ #010+ @@ -957,7 +957,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'else'#010+ - '# long version for 1.0.x - tar','get specific extensions'#010+ + '# long vers','ion for 1.0.x - target specific extensions'#010+ #010+ '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ @@ -973,8 +973,8 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# Go32v2'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ - 'STATICLIBPREFIX='#010+ - 'SHORTS','UFFIX=dos'#010+ + 'STAT','ICLIBPREFIX='#010+ + 'SHORTSUFFIX=dos'#010+ 'endif'#010+ #010+ '# watcom'#010+ @@ -992,9 +992,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# FreeBSD'#010+ - 'ifeq ($(OS_TARGET),freebsd)'#010+ + 'ifeq ($(OS_TARGET),freebs','d)'#010+ 'BATCHEXT=.sh'#010+ - 'EXE','EXT='#010+ + 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ 'SHORTSUFFIX=fbs'#010+ 'endif'#010+ @@ -1012,10 +1012,10 @@ const fpcmakeini : array[0..213,1..240] of char=( 'BATCHEXT=.sh'#010+ 'EXEEXT='#010+ 'HASSHAREDLIB=1'#010+ - 'SHORTSUFFIX=obs'#010+ + 'SHORTSUFF','IX=obs'#010+ 'endif'#010+ #010+ - '# Win','32'#010+ + '# Win32'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ 'PPUEXT=.ppw'#010+ 'OEXT=.ow'#010+ @@ -1032,9 +1032,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'PPUEXT=.ppo'#010+ 'ASMEXT=.so2'#010+ 'OEXT=.oo2'#010+ - 'AOUTEXT=.out'#010+ + 'AOUTEXT=.','out'#010+ 'SMARTEXT=.sl2'#010+ - 'S','TATICLIBPREFIX='#010+ + 'STATICLIBPREFIX='#010+ 'STATICLIBEXT=.ao2'#010+ 'SHAREDLIBEXT=.dll'#010+ 'SHORTSUFFIX=os2'#010+ @@ -1050,11 +1050,11 @@ const fpcmakeini : array[0..213,1..240] of char=( 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'SHAREDLIBEXT=.library'#010+ - 'SHORTSUFFIX=amg'#010+ + 'SHORTSUFFIX=a','mg'#010+ 'endif'#010+ #010+ '# Atari'#010+ - 'i','feq ($(OS_TARGET),atari)'#010+ + 'ifeq ($(OS_TARGET),atari)'#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ @@ -1071,9 +1071,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ 'SMARTEXT=.sl'#010+ - 'STATICLIBEXT=.a'#010+ + 'STATICLIBEXT=.','a'#010+ 'EXEEXT='#010+ - 'SHORTSUFF','IX=be'#010+ + 'SHORTSUFFIX=be'#010+ 'endif'#010+ #010+ '# Solaris'#010+ @@ -1093,8 +1093,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'BATCHEXT=.sh'#010+ 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ - 'OEXT=.o'#010+ - 'SMARTEXT=.sl'#010, + 'OE','XT=.o'#010+ + 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ 'SHORTSUFFIX=qnx'#010+ @@ -1113,8 +1113,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'SHORTSUFFIX=nw'#010+ 'endif'#010+ #010+ - '# Netware libc'#010+ - 'ifeq ($(OS_T','ARGET),netwlibc)'#010+ + '# Netwar','e libc'#010+ + 'ifeq ($(OS_TARGET),netwlibc)'#010+ 'STATICLIBPREFIX='#010+ 'PPUEXT=.ppu'#010+ 'OEXT=.o'#010+ @@ -1132,8 +1132,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'PPUEXT=.ppu'#010+ 'ASMEXT=.s'#010+ 'OEXT=.o'#010+ - 'SMARTEXT=.sl'#010+ - 'STATICL','IBEXT=.a'#010+ + 'S','MARTEXT=.sl'#010+ + 'STATICLIBEXT=.a'#010+ 'EXEEXT='#010+ 'DEBUGSYMEXT=.xcoff'#010+ 'SHORTSUFFIX=mac'#010+ @@ -1144,8 +1144,8 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# For 8.3 limited OS'#039's the short suffixes'#010+ '# Otherwise use the full source/target names'#010+ - 'ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)'#010+ - 'FPCMA','DE=fpcmade.$(SHORTSUFFIX)'#010+ + 'ifneq ($(findstring $(OS_SOURCE),$(','LIMIT83fs)),)'#010+ + 'FPCMADE=fpcmade.$(SHORTSUFFIX)'#010+ 'ZIPSUFFIX=$(SHORTSUFFIX)'#010+ 'ZIPCROSSPREFIX='#010+ 'ZIPSOURCESUFFIX=src'#010+ @@ -1155,7 +1155,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ZIPSOURCESUFFIX=.source'#010+ 'ZIPEXAMPLESUFFIX=.examples'#010+ 'ifdef CROSSCOMPILE'#010+ - 'ZIPSUFFIX=.$(SOURCESUFFIX',')'#010+ + 'ZIPSUF','FIX=.$(SOURCESUFFIX)'#010+ 'ZIPCROSSPREFIX=$(TARGETSUFFIX)-'#010+ 'else'#010+ 'ZIPSUFFIX=.$(TARGETSUFFIX)'#010+ @@ -1166,7 +1166,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '[defaulttools]'#010+ '#####################################################################'#010+ '# Default Tools'#010+ - '############################################','########################'+ + '#########################','###########################################'+ '#'#010+ #010+ '# Names of the binutils tools'#010+ @@ -1175,8 +1175,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ARNAME=$(BINUTILSPREFIX)ar'#010+ 'RCNAME=$(BINUTILSPREFIX)rc'#010+ 'ifneq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+ - 'ifeq ($(OS_TARGET),win32)'#010+ - 'ifeq (','$(CROSSBINDIR),)'#010+ + 'ifeq ($(OS_TA','RGET),win32)'#010+ + 'ifeq ($(CROSSBINDIR),)'#010+ 'ASNAME=asw'#010+ 'LDNAME=ldw'#010+ 'ARNAME=arw'#010+ @@ -1191,9 +1191,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'else'#010+ 'ASPROG=$(ASNAME)'#010+ 'endif'#010+ - 'endif'#010+ + 'endi','f'#010+ #010+ - '# linker, but pr','obably not used'#010+ + '# linker, but probably not used'#010+ 'ifndef LDPROG'#010+ 'ifdef CROSSBINDIR'#010+ 'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)'#010+ @@ -1205,9 +1205,9 @@ const fpcmakeini : array[0..213,1..240] of char=( '# Resource compiler'#010+ 'ifndef RCPROG'#010+ 'ifdef CROSSBINDIR'#010+ - 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)'#010+ + 'RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT',')'#010+ 'else'#010+ - 'RCPROG=$(RCN','AME)'#010+ + 'RCPROG=$(RCNAME)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1226,8 +1226,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'RC=$(RCPROG)'#010+ 'AR=$(ARPROG)'#010+ #010+ - '# ppas.bat / ppas.sh'#010+ - 'PPAS=p','pas$(SRCBATCHEXT)'#010+ + '# ppas.b','at / ppas.sh'#010+ + 'PPAS=ppas$(SRCBATCHEXT)'#010+ #010+ '# ldconfig to rebuild .so cache'#010+ 'ifdef inUnix'#010+ @@ -1242,8 +1242,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'DATESTR='#010+ 'endif'#010+ #010+ - '# Look if UPX is found for go32v2 and win32. We can'#039't use $UPX bec'+ - 'uase',#010+ + '# Look if UPX is found for go32v2 and win32. We can',#039't use $UPX bec'+ + 'uase'#010+ '# upx uses that one itself (PFV)'#010+ 'ifndef UPXPROG'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ @@ -1254,8 +1254,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'ifdef UPXPROG'#010+ 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(SRCEXEEXT),$(SEARCHPATH)'+ - ')))'#010+ - 'ifeq ($(UPXPROG)',',)'#010+ + ')','))'#010+ + 'ifeq ($(UPXPROG),)'#010+ 'UPXPROG='#010+ 'else'#010+ 'UPXPROG:=$(firstword $(UPXPROG))'#010+ @@ -1276,16 +1276,16 @@ const fpcmakeini : array[0..213,1..240] of char=( 'TAREXT=.tar.bz2'#010+ 'else'#010+ 'TAROPT=vz'#010+ - 'TAREXT=.tar.gz'#010+ + 'TAREXT=.ta','r.gz'#010+ 'endif'#010+ #010+ #010+ - '[comma','nd_begin]'#010+ + '[command_begin]'#010+ '#####################################################################'#010+ '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load commandline OPTDEF and add FPC_CPU define, for compiling t','he'#010+ + '# Load commandline OPTDEF and add FPC_CPU defi','ne, for compiling the'#010+ '# compiler this needs to be turned off'#010+ 'ifndef NOCPUDEF'#010+ 'override FPCOPTDEF=$(CPU_TARGET)'#010+ @@ -1294,10 +1294,10 @@ const fpcmakeini : array[0..213,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+ + 'override FPCOPT+=-T$(OS_TA','RGET)'#010+ 'endif'#010+ #010+ - 'ifneq ','($(CPU_TARGET),$(CPU_SOURCE))'#010+ + 'ifneq ($(CPU_TARGET),$(CPU_SOURCE))'#010+ 'override FPCOPT+=-P$(CPU_TARGET)'#010+ 'endif'#010+ #010+ @@ -1307,8 +1307,8 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'ifndef CROSSBOOTSTRAP'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ - 'override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc'#010+ - 'end','if'#010+ + 'override FPCOPT+=-XP$(BINU','TILSPREFIX) -Xc'#010+ + 'endif'#010+ 'ifneq ($(BINUTILSPREFIX),)'#010+ 'override FPCOPT+=-Xr$(RLINKPATH)'#010+ 'endif'#010+ @@ -1319,7 +1319,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ - 'override FPCOPT+=$(addprefix ','-Fl,$(LIBDIR))'#010+ + 'override F','PCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ @@ -1333,8 +1333,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'override FPCOPT+=-XX'#010+ 'endif'#010+ #010+ - '# Smartlinking creation'#010+ - 'ifdef CRE','ATESMART'#010+ + '# Smartlinking',' creation'#010+ + 'ifdef CREATESMART'#010+ 'override FPCOPT+=-CX'#010+ 'endif'#010+ #010+ @@ -1348,7 +1348,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '# (strip, optimize and don'#039't load fpc.cfg)'#010+ '# fpc 2.1 has -O2 for all targets'#010+ 'ifdef RELEASE'#010+ - 'ifneq ($(findstring 2.0','.,$(FPC_VERSION)),)'#010+ + 'ifne','q ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ 'ifeq ($(CPU_TARGET),i386)'#010+ 'FPCCPUOPT:=-OG2p3'#010+ 'endif'#010+ @@ -1360,10 +1360,10 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n'#010+ 'override FPCOPTDEF+=RELEASE'#010+ - 'endif'#010+ + 'endif',#010+ #010+ '# Strip'#010+ - 'ifdef STR','IP'#010+ + 'ifdef STRIP'#010+ 'override FPCOPT+=-Xs'#010+ 'endif'#010+ #010+ @@ -1379,7 +1379,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# Needed compiler options'#010+ 'ifdef COMPILER_OPTIONS'#010+ - 'override FPCOPT+=$(COM','PILER_OPTIONS)'#010+ + 'ove','rride FPCOPT+=$(COMPILER_OPTIONS)'#010+ 'endif'#010+ 'ifdef COMPILER_UNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+ @@ -1388,7 +1388,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_OBJECTDIR'#010+ - 'override FPCOPT+=$(add','prefix -Fo,$(COMPILER_OBJECTDIR))'#010+ + 'ove','rride FPCOPT+=$(addprefix -Fo,$(COMPILER_OBJECTDIR))'#010+ 'endif'#010+ 'ifdef COMPILER_INCLUDEDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+ @@ -1399,7 +1399,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'override FPCOPT+=-FD$(CROSSBINDIR)'#010+ 'endif'#010+ #010+ - '# Target dirs and the prefi','x to use for clean/install'#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+ @@ -1409,16 +1409,16 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Unit target dir (defa','ult is units/-/'#010+ + '# Un','it target dir (default is units/-/'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ 'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+ 'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+ 'override UNITTARGETDIRPREFIX='#010+ 'else'#010+ - 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETDIR)/'#010+ + 'override UNITTARGETDIRPREFIX=$(COMPILER_UNITTARGETD','IR)/'#010+ 'endif'#010+ 'else'#010+ - 'ifd','ef COMPILER_TARGETDIR'#010+ + 'ifdef COMPILER_TARGETDIR'#010+ 'override COMPILER_UNITTARGETDIR=$(COMPILER_TARGETDIR)'#010+ 'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+ 'endif'#010+ @@ -1428,11 +1428,11 @@ const fpcmakeini : array[0..213,1..240] of char=( 'override FPCOPT+=-Cg'#010+ #010+ 'ifeq ($(CPU_TARGET),i386)'#010+ - 'override FPCOPT+=-Aas'#010+ + 'override FPCOPT+=','-Aas'#010+ 'endif'#010+ #010+ 'endif'#010+ - #010, + #010+ '# create always pic'#039'ed code on x86_64'#010+ 'ifeq ($(findstring 2.0.,$(FPC_VERSION)),)'#010+ 'ifeq ($(OS_TARGET),linux)'#010+ @@ -1443,8 +1443,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'ifdef LINKSHARED'#010+ - '#!!! deactived for testing override FPCOPT+=-XD'#010+ - 'e','ndif'#010+ + '#!!! deactived for testing ove','rride FPCOPT+=-XD'#010+ + 'endif'#010+ #010+ #010+ '[command_libc]'#010+ @@ -1458,7 +1458,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[command_end]'#010+ - '# Add commandline options last so they can ove','rride'#010+ + '# Add commandline options l','ast so they can override'#010+ 'ifdef OPT'#010+ 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ @@ -1470,10 +1470,10 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ '# Was a config file specified ?'#010+ 'ifdef CFGFILE'#010+ - 'override FPCOPT+=@$(CFGFILE)'#010+ + 'override FPCOPT+=@$(','CFGFILE)'#010+ 'endif'#010+ #010+ - '# U','se the environment to pass commandline options?'#010+ + '# Use the environment to pass commandline options?'#010+ 'ifdef USEENV'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ @@ -1481,7 +1481,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'override AFULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+ - 'override AFULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)',#010+ + 'override AFULL_SOURCE=$(CPU_S','OURCE)-$(OS_SOURCE)'#010+ #010+ 'ifneq ($(AFULL_TARGET),$(AFULL_SOURCE))'#010+ 'override ACROSSCOMPILE=1'#010+ @@ -1494,8 +1494,8 @@ const fpcmakeini : array[0..213,1..240] of char=( '# Compiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ - '# also call ppas if with command option -s'#010+ - '# but o','nly if the FULL_SOURCE and FULL_TARGET are equal'#010+ + '# also call ppas if with comman','d option -s'#010+ + '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ @@ -1506,7 +1506,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[loaderrules]'#010+ - '######################################################','##############'+ + '###################################','#################################'+ '#'#010+ '# Loaders'#010+ '#####################################################################'#010+ @@ -1516,7 +1516,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifneq ($(TARGET_LOADERS),)'#010+ 'override ALLTARGET+=fpc_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ - 'override INSTALLTARGET+','=fpc_loaders_install'#010+ + 'over','ride INSTALLTARGET+=fpc_loaders_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(TARGET_LOADERS))'#010+ 'endif'#010+ @@ -1525,8 +1525,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+ 'else'#010+ - ' $(AS) -o $*$(OEXT) $<'#010+ - 'endif',#010+ + ' $(AS) -o',' $*$(OEXT) $<'#010+ + 'endif'#010+ #010+ 'fpc_loaders: $(COMPILER_UNITTARGETDIR) $(LOADEROFILES)'#010+ #010+ @@ -1536,19 +1536,19 @@ const fpcmakeini : array[0..213,1..240] of char=( ')'#010+ 'else'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ - 'endif'#010+ + 'endif'#010, #010+ - 'fpc_loaders_instal','l:'#010+ + 'fpc_loaders_install:'#010+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ 'ifdef COMPILER_UNITTARGETDIR'#010+ ' $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+ 'ES)) $(INSTALL_UNITDIR)'#010+ 'else'#010+ - ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+ + ' $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010, 'endif'#010+ #010+ #010+ - '[unitrules]',#010+ + '[unitrules]'#010+ '#####################################################################'#010+ '# Units'#010+ '#####################################################################'#010+ @@ -1556,13 +1556,13 @@ const fpcmakeini : array[0..213,1..240] of char=( '.PHONY: fpc_units'#010+ #010+ 'ifneq ($(TARGET_UNITS),)'#010+ - 'override ALLTARGET+=fpc_units'#010+ + 'override ALLTARGET+=fpc_uni','ts'#010+ #010+ - 'override UNITPP','UFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ + 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+ 'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+ 'NITS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+ - 'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITU','NITPPUFILES)'#010+ + 'override CLEANPPUFILES+=$(UNITPP','UFILES) $(IMPLICITUNITPPUFILES)'#010+ 'endif'#010+ #010+ 'fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)'#010+ @@ -1571,41 +1571,42 @@ const fpcmakeini : array[0..213,1..240] of char=( '[exerules]'#010+ '#####################################################################'#010+ '# Exes'#010+ - '#####################################################################'#010+ + '##########################################################','##########'+ + '#'#010+ #010+ - '.PHONY',': fpc_exes'#010+ + '.PHONY: fpc_exes'#010+ #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)) $(addpref', - 'ix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'+ - ' $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_P'+ - 'ROGRAMS)))'#010+ + 'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_P','ROGRAMS)) $(addpre'+ + 'fix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))'+ + ') $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_'+ + 'PROGRAMS)))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ - 'override CLEANEXEFILE','S+=$(EXEFILES) $(EXEOFILES)'#010+ + 'ov','erride 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+ + 'endif',#010+ 'endif'#010+ 'endif'#010+ #010+ - 'fpc_e','xes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES'+ - ')'#010+ + 'fpc_exes: $(COMPILER_TARGETDIR) $(COMPILER_UNITTARGETDIR) $(EXEFILES)'#010+ #010+ #010+ '[rstrules]'#010+ '#####################################################################'#010+ '# Resource strings'#010+ - '#####################################################################'#010+ + '######################################################','##############'+ + '#'#010+ #010+ - 'if','def TARGET_RSTS'#010+ + 'ifdef TARGET_RSTS'#010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))'#010+ #010+ 'override CLEANRSTFILES+=$(RSTFILES)'#010+ @@ -1615,7 +1616,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '###########################','#########################################'+ + '########','############################################################'+ '#'#010+ #010+ '.PHONY: fpc_examples'#010+ @@ -1623,17 +1624,17 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifneq ($(TARGET_EXAMPLES),)'#010+ 'HASEXAMPLES=1'#010+ 'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMP'+ - 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(','TARGET'+ + 'LES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) ','$(addsuffix .lpr,$(TARGET'+ '_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+ 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+ - 'refix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBE','XT),$(TARGET_EXAMPL'+ + 'refix $(STATICLIBPREFIX),$(add','suffix $(STATICLIBEXT),$(TARGET_EXAMPL'+ 'ES))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TAR'+ 'GET_EXAMPLES)))'#010+ #010+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ 'ifeq ($(OS_TARGET),os2)'#010+ - 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARG','ET_EXAMPLES))'#010+ + 'override CLEANEXEFILES+=$(addsuffi','x $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),emx)'#010+ 'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+ @@ -1643,7 +1644,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'HASEXAMPLES=1'#010+ 'endif'#010+ #010+ - 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMP','LED'+ + 'fpc_examples: all $(EXAMPLEFILES) $(addsuffix ','_all,$(TARGET_EXAMPLED'+ 'IRS))'#010+ #010+ #010+ @@ -1652,7 +1653,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '# General compile rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_all fpc_smart fpc_debug fpc_release f','pc_shared'#010+ + '.PHONY: fpc_all fpc_smart fpc_','debug fpc_release fpc_shared'#010+ #010+ '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+ ' @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+ @@ -1665,8 +1666,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'fpc_debug:'#010+ ' $(MAKE) all DEBUG=1'#010+ #010+ - 'fpc_release:'#010+ - ' ','$(MAKE) all RELEASE=1'#010+ + 'fp','c_release:'#010+ + ' $(MAKE) all RELEASE=1'#010+ #010+ '# General compile rules, available for both possible .pp and .pas exte'+ 'nsions'#010+ @@ -1674,7 +1675,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res'#010+ #010+ '$(COMPILER_UNITTARGETDIR):'#010+ - ' $(MKDIRTREE) $(COMPILER_UNITTARGETDI','R)'#010+ + ' $(MKDIRTREE) $(CO','MPILER_UNITTARGETDIR)'#010+ #010+ '$(COMPILER_TARGETDIR):'#010+ ' $(MKDIRTREE) $(COMPILER_TARGETDIR)'#010+ @@ -1688,8 +1689,8 @@ const fpcmakeini : array[0..213,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ - ' $(COMPILER) $<'#010+ - ' ',' $(EXECPPAS)'#010+ + ' $(','COMPILER) $<'#010+ + ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ ' $(COMPILER) $<'#010+ @@ -1704,20 +1705,20 @@ const fpcmakeini : array[0..213,1..240] of char=( ' $(EXECPPAS)'#010+ #010+ '%.res: %.rc'#010+ - ' windres -i $< -o $@',#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_INCLUDEDIR)'#010+ - 'vpath %.dpr $(COMPILE','R_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ + 'vp','ath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+ 'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+ 'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+ #010+ '[sharedrules]'#010+ '#####################################################################'#010+ '# Library'#010+ - '#########################','###########################################'+ + '######','##############################################################'+ '#'#010+ #010+ '.PHONY: fpc_shared'#010+ @@ -1729,17 +1730,17 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'ifndef SHARED_LIBNAME'#010+ - 'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+ + 'SHARED_LIBNAME=$(PACKAGE','_NAME)'#010+ 'endif'#010+ #010+ - 'ifnde','f SHARED_FULLNAME'#010+ + 'ifndef SHARED_FULLNAME'#010+ 'SHARED_FULLNAME=$(SHAREDLIBPREFIX)$(SHARED_LIBNAME)-$(SHARED_LIBVERSIO'+ 'N)$(SHAREDLIBEXT)'#010+ 'endif'#010+ #010+ '# Default sharedlib units are all unit objects'#010+ 'ifndef SHARED_LIBUNITS'#010+ - 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010, + 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TAR','GET_IMPLICITUNITS)'#010+ 'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+ 'IBUNITS))'#010+ 'endif'#010+ @@ -1748,7 +1749,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef HASSHAREDLIB'#010+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ - ' $(PPUMOVE) -q $(SHARED_LIB','UNITS) -i$(COMPILER_UNITTARGETDIR)'+ + ' $(PPUMO','VE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+ ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR)'#010+ 'endif'#010+ 'else'#010+ @@ -1757,8 +1758,8 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'fpc_shared_install:'#010+ 'ifneq ($(SHARED_BUILD),n)'#010+ - 'ifneq ($(SHARED_LIBUNITS),)'#010+ - 'ifneq ($(wildcar','d $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ + 'ifneq ($(SHARED_LIBUNITS)',',)'#010+ + 'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+ ' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+ 'ALL_SHAREDDIR)'#010+ 'endif'#010+ @@ -1766,37 +1767,38 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '[installrules]'#010+ - '#####################################################################'#010+ - '#',' Install rules'#010+ + '####################################################','################'+ + '#'#010+ + '# Install rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+ #010+ 'ifdef INSTALL_UNITS'#010+ - 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+ + 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL','_UNITS))'#010+ 'endif'#010+ #010+ - 'ifd','ef INSTALL_BUILDUNIT'#010+ + 'ifdef INSTALL_BUILDUNIT'#010+ 'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$'+ '(INSTALLPPUFILES))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+ - 'LES)) $(addprefix $(STATICLIBPR','EFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ + 'LES)) $(addp','refix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEX'+ 'T),$(INSTALLPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEX'+ 'T),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+ 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+ - 'override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),','$(notdi'+ + 'override INSTALLPPUFILES:=$(addprefix $(UN','ITTARGETDIRPREFIX),$(notdi'+ 'r $(INSTALLPPUFILES)))'#010+ 'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+ 'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+ 'endif'#010+ '# Implicitly install Package.fpc'#010+ 'override INSTALL_CREATEPACKAGEFPC=1'#010+ - 'endif'#010+ + 'endif',#010+ #010+ - 'ifdef INSTALLEXEF','ILES'#010+ + 'ifdef INSTALLEXEFILES'#010+ 'ifneq ($(TARGETDIRPREFIX),)'#010+ 'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+ 'STALLEXEFILES)))'#010+ @@ -1805,8 +1807,8 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'fpc_install: all $(INSTALLTARGET)'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' $(MKDIR) $(INSTALL_BINDIR)'#010+ - '# Compress the e','xes if upx is defined'#010+ + ' $(MKDIR) $(INSTALL_BINDI','R)'#010+ + '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ 'endif'#010+ @@ -1814,14 +1816,14 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'ifdef INSTALL_CREATEPACKAGEFPC'#010+ 'ifdef FPCMAKE'#010+ - '# If the fpcpackage variable is set then create a','nd install Package.'+ + '# If the fpcpackage variable i','s set then create and install Package.'+ 'fpc,'#010+ '# a safety check is done if Makefile.fpc is available'#010+ 'ifdef PACKAGE_VERSION'#010+ 'ifneq ($(wildcard Makefile.fpc),)'#010+ ' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+ - ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ - ' ',' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ + ' $(MKDIR) $(INST','ALL_UNITDIR)'#010+ + ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1830,13 +1832,13 @@ const fpcmakeini : array[0..213,1..240] of char=( ' $(MKDIR) $(INSTALL_UNITDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ - ' $(INSTALL) $(INST','ALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ + ' ',' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+ 'endif'#010+ 'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+ ' $(MKDIR) $(INSTALL_LIBDIR)'#010+ ' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+ 'ifdef inUnix'#010+ - ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)',#010+ + ' ln -sf $(LIB_FULLNAME) $(INSTALL_','LIBDIR)/$(LIB_NAME)'#010+ 'endif'#010+ 'endif'#010+ 'endif'#010+ @@ -1847,16 +1849,16 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'fpc_sourceinstall: distclean'#010+ ' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+ - ' $(COPYTREE) $(BASEDIR)/* $(I','NSTALL_SOURCEDIR)'#010+ + ' $(COPYTRE','E) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+ #010+ 'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+ 'endif'#010+ 'ifdef EXAMPLESOURCEFILES'#010+ - ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+ + ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_','EXAMPLEDIR)'#010+ 'endif'#010+ - 'i','fdef TARGET_EXAMPLEDIRS'#010+ + 'ifdef TARGET_EXAMPLEDIRS'#010+ ' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+ 'AMPLEDIR)'#010+ 'endif'#010+ @@ -1864,7 +1866,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '[distinstallrules]'#010+ '#####################################################################'#010+ '# Dist Install'#010+ - '#########################','###########################################'+ + '######','##############################################################'+ '#'#010+ #010+ '.PHONY: fpc_distinstall'#010+ @@ -1875,14 +1877,15 @@ const fpcmakeini : array[0..213,1..240] of char=( '[zipinstallrules]'#010+ '#####################################################################'#010+ '# Zip'#010+ - '#################################','###################################'+ + '##############','######################################################'+ '#'#010+ #010+ '.PHONY: fpc_zipinstall fpc_zipsourceinstall 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+ - 'ifndef PAC','KDIR'#010+ + '# subdir, because the deltree can'#039't see the whole tree t','o remove'+ + #010+ + 'ifndef PACKDIR'#010+ 'ifndef inUnix'#010+ 'PACKDIR=$(BASEDIR)/../fpc-pack'#010+ 'else'#010+ @@ -1895,11 +1898,11 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef DIST_ZIPNAME'#010+ 'ZIPNAME=$(DIST_ZIPNAME)'#010+ 'else'#010+ - 'ZIPNAME=$(PACKAGE_NAME)'#010+ + 'ZIPNAME=$(PACKAGE_NA','ME)'#010+ 'endif'#010+ 'endif'#010+ #010+ - 'if','ndef FULLZIPNAME'#010+ + 'ifndef FULLZIPNAME'#010+ 'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+ 'endif'#010+ #010+ @@ -1912,8 +1915,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Use tar by default under linux'#010+ - 'ifndef U','SEZIP'#010+ + '# Use tar by default u','nder linux'#010+ + 'ifndef USEZIP'#010+ 'ifdef inUnix'#010+ 'USETAR=1'#010+ 'endif'#010+ @@ -1927,22 +1930,21 @@ const fpcmakeini : array[0..213,1..240] of char=( '# We need to be able to run in the current OS so fix'#010+ '# the path separator'#010+ 'ifdef USEZIPWRAPPER'#010+ - 'ZIPPATHSEP=$(PATHSEP)'#010+ - 'ZIP','WRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT)'+ - ')'#010+ + 'ZIPPAT','HSEP=$(PATHSEP)'#010+ + 'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+ 'else'#010+ 'ZIPPATHSEP=/'#010+ 'endif'#010+ #010+ '# Create commands to create the zip/tar file'#010+ 'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+ - 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASED','IR))'#010+ + 'ZIPCMD_CDBASE:=cd $(subst /,$(','ZIPPATHSEP),$(BASEDIR))'#010+ 'ifdef USETAR'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+ 'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+ 'else'#010+ 'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+ - 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOP','T) $(ZIPD'+ + 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZI','PPROG)) -Dr $(ZIPOPT) $(ZIPD'+ 'ESTFILE) *'#010+ 'endif'#010+ #010+ @@ -1951,13 +1953,13 @@ const fpcmakeini : array[0..213,1..240] of char=( ' $(MKDIR) $(DIST_DESTDIR)'#010+ ' $(DEL) $(ZIPDESTFILE)'#010+ 'ifdef USEZIPWRAPPER'#010+ - '# Handle gecho separate as we need to espace \',' with \\'#010+ + '# Handle gecho separate as ','we need to espace \ with \\'#010+ 'ifneq ($(ECHOREDIR),echo)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+ 'R)'#010+ ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+ #010+ - ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $','(ZIPWRA'+ + ' $(ECHOREDIR) -e "$(subst \,\\,$(ZI','PCMD_CDBASE))" >> $(ZIPWRA'+ 'PPER)'#010+ 'else'#010+ ' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+ @@ -1967,9 +1969,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef inUnix'#010+ ' /bin/sh $(ZIPWRAPPER)'#010+ 'else'#010+ - ' $(ZIPWRAPPER)'#010+ + ' $(ZI','PWRAPPER)'#010+ 'endif'#010+ - ' ',' $(DEL) $(ZIPWRAPPER)'#010+ + ' $(DEL) $(ZIPWRAPPER)'#010+ 'else'#010+ ' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+ 'endif'#010+ @@ -1977,9 +1979,9 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'fpc_zipsourceinstall:'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+ - 'SOURCESUFFIX)'#010+ + 'S','OURCESUFFIX)'#010+ #010+ - 'fpc_z','ipexampleinstall:'#010+ + 'fpc_zipexampleinstall:'#010+ 'ifdef HASEXAMPLES'#010+ ' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+ 'PEXAMPLESUFFIX)'#010+ @@ -1990,7 +1992,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[cleanrules]'#010+ - '#######################','#############################################'+ + '####','################################################################'+ '#'#010+ '# Clean rules'#010+ '#####################################################################'#010+ @@ -1998,7 +2000,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+ #010+ 'ifdef EXEFILES'#010+ - 'override CLEANEXEFILES:=$(addprefix $(TARGETDIR','PREFIX),$(CLEANEXEFIL'+ + 'override CLEANEXEFILES:=$(ad','dprefix $(TARGETDIRPREFIX),$(CLEANEXEFIL'+ 'ES))'#010+ 'endif'#010+ #010+ @@ -2008,13 +2010,13 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'ifdef CLEANPPUFILES'#010+ 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+ - ') $(addprefix $(STATICLIBPREFI','X),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ + ') $(addpref','ix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+ '(CLEANPPUFILES))) $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(S'+ 'TATICLIBEXT),$(CLEANPPUFILES)))'#010+ 'ifdef DEBUGSYMEXT'#010+ - 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+ - 'UFILES))'#010+ - 'end','if'#010+ + 'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(','CLEAN'+ + 'PPUFILES))'#010+ + 'endif'#010+ 'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+ 'ILES))'#010+ 'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+ @@ -2022,8 +2024,8 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ - 'ifdef CLEANEXEFILES'#010+ - ' -$','(DEL) $(CLEANEXEFILES)'#010+ + 'ifdef CLEAN','EXEFILES'#010+ + ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ @@ -2032,7 +2034,7 @@ const fpcmakeini : array[0..213,1..240] of char=( ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ - ' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANR','STFILES))'+ + ' -$(DEL) $(addprefix $(UNITTARGET','DIRPREFIX),$(CLEANRSTFILES))'+ #010+ 'endif'#010+ 'ifdef CLEAN_FILES'#010+ @@ -2042,8 +2044,8 @@ const fpcmakeini : array[0..213,1..240] of char=( ' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+ - 'PCEXTFILE) $(REDIRFILE)'#010+ - ' -$','(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ + 'PCEXTFILE) $(RE','DIRFILE)'#010+ + ' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+ #010+ 'fpc_cleanall: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ @@ -2053,7 +2055,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ - 'ifneq ($(CLEANPPULINKFILES),',')'#010+ + 'ifneq ($(','CLEANPPULINKFILES),)'#010+ ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ @@ -2061,15 +2063,15 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'endif'#010+ ' -$(DELTREE) units'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL','I'+ - 'BEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$','(ASMEXT) *$(STATICL'+ + 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ 'ifneq ($(PPUEXT),.ppu)'#010+ ' -$(DEL) *.o *.ppu *.a'#010+ 'endif'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ ' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+ 'CEXTFILE) $(REDIRFILE)'#010+ - ' -$(DEL) *_pp','as$(BATCHEXT)'#010+ + ' ',' -$(DEL) *_ppas$(BATCHEXT)'#010+ 'ifdef AOUTEXT'#010+ ' -$(DEL) *$(AOUTEXT)'#010+ 'endif'#010+ @@ -2081,8 +2083,9 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ #010+ '[baseinforules]'#010+ - '#####################################################################'#010+ - '# Base in','fo rules'#010+ + '############################################################','########'+ + '#'#010+ + '# Base info rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_baseinfo'#010+ @@ -2092,94 +2095,94 @@ const fpcmakeini : array[0..213,1..240] of char=( 'fpc_baseinfo:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Package info =='#010+ - ' @$(ECHO) Package Name..... ','$(PACKAGE_NAME)'#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 Version.. $(FPC_VERSION)'#010+ - ' ',' @$(ECHO) Source CPU... $(CPU_SOURCE)'#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_TARGET)'#010+ - ' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+ - ' @$(ECHO) ',' Full Target.. $(FULL_TARGET)'#010+ + ' @$(ECHO) Full Source.. $(FULL_SOURCE',')'#010+ + ' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+ ' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+ ' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Required pkgs... $(REQU','IRE_PACKAGES)'#010+ + ' @$(ECHO) Requ','ired pkgs... $(REQUIRE_PACKAGES)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+ ' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+ ' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+ - ' @$(ECHO) Pac','kagesDir..... $(PACKAGESDIR)'#010+ + ' ',' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) As.......','. $(AS)'#010+ + ' ','@$(ECHO) As........ $(AS)'#010+ ' @$(ECHO) Ld........ $(LD)'#010+ ' @$(ECHO) Ar........ $(AR)'#010+ ' @$(ECHO) Rc........ $(RC)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Mv........ $(MVPROG)'#010+ ' @$(ECHO) Cp........ $(CPPROG)'#010+ - ' @$(ECHO) Rm........ $(R','MPROG)'#010+ + ' @$(EC','HO) Rm........ $(RMPROG)'#010+ ' @$(ECHO) GInstall.. $(GINSTALL)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ ' @$(ECHO) Shell..... $(SHELL)'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ ' @$(ECHO) FPCMake... $(FPCMAKE)'#010+ - ' @$(ECHO) PPUMove... $(PPUMOVE)'#010, + ' @$(ECHO) PPU','Move... $(PPUMOVE)'#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+ + ' @$(E','CHO) Target Units.......... $(TARGET_UNITS)'#010+ ' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+ ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+ - ' @$(ECHO) Target Examples','....... $(TARGET_EXAMPLES)'#010+ + ' @$(ECH','O) 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)'#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+ - ' @$(ECH','O) ZipName.............. $(ZIPNAME)'#010+ + ' @$(ECHO) DateStr.............. $(DATE','STR)'#010+ + ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+ - ' @$(ECHO) FullZipName..........',' $(FULLZIPNAME)'#010+ + ' @$(ECHO) Fu','llZipName.......... $(FULLZIPNAME)'#010+ ' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+ - ' @$(ECHO) Install li','brary dir.. $(INSTALL_LIBDIR)'#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 exampl','e dir.. $(INSTALL_EXAMPLEDIR)'#010+ + ' @$(EC','HO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+ ' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+ ' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+ - ' @$(ECHO)'#010+ + ' ',' @$(ECHO)'#010+ #010+ - '[inf','orules]'#010+ + '[inforules]'#010+ '#####################################################################'#010+ '# Info rules'#010+ '#####################################################################'#010+ @@ -2189,15 +2192,15 @@ const fpcmakeini : array[0..213,1..240] of char=( 'fpc_info: $(INFORULES)'#010+ #010+ '[makefilerules]'#010+ - '####################','################################################'+ + '#','###################################################################'+ '#'#010+ '# Rebuild Makefile'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+ ' \'#010+ - ' fpc_makefile_dirs'#010+ - #010, + ' ','fpc_makefile_dirs'#010+ + #010+ 'fpc_makefile:'#010+ ' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+ #010+ @@ -2207,7 +2210,7 @@ const fpcmakeini : array[0..213,1..240] of char=( 'T_DIRS))'#010+ 'endif'#010+ 'ifdef TARGET_EXAMPLEDIRS'#010+ - ' $(FPCMAKE) -w -T$(OS','_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ + ' $','(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+ 'GET_EXAMPLEDIRS))'#010+ 'endif'#010+ #010+ @@ -2216,7 +2219,7 @@ const fpcmakeini : array[0..213,1..240] of char=( #010+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+ #010+ - 'fpc_makefiles: fpc_makefile fpc_ma','kefile_dirs'#010+ + 'fpc_makefiles: ','fpc_makefile fpc_makefile_dirs'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ @@ -2224,7 +2227,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '#####################################################################'#010+ #010+ 'ifneq ($(wildcard fpcmake.loc),)'#010+ - 'include fpcmake.loc'#010, + 'i','nclude fpcmake.loc'#010+ 'endif'#010+ #010+ #010+ @@ -2234,7 +2237,7 @@ const fpcmakeini : array[0..213,1..240] of char=( '#####################################################################'#010+ #010+ '[lclrules]'#010+ - '######################################################','##############'+ + '###################################','#################################'+ '#'#010+ '# LCL Rules'#010+ '#####################################################################'#010+ @@ -2244,10 +2247,10 @@ const fpcmakeini : array[0..213,1..240] of char=( 'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+ 'LCL_PLATFORM=win32'#010+ 'else'#010+ - 'LCL_PLATFORM=gtk'#010+ + 'LCL_PLATFORM=gt','k'#010+ 'endif'#010+ 'endif'#010+ - 'expor','t LCL_PLATFORM'#010+ + 'export LCL_PLATFORM'#010+ #010+ '# Check if the specified LCLDIR is correct'#010+ 'ifdef LCLDIR'#010+ @@ -2257,9 +2260,9 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ 'else'#010+ 'override LCLDIR=wrong'#010+ - 'endif'#010+ + 'en','dif'#010+ #010+ - '# Check if the',' default LCLDIR is correct'#010+ + '# Check if the default LCLDIR is correct'#010+ 'ifdef DEFAULT_LCLDIR'#010+ 'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+ @@ -2268,39 +2271,40 @@ const fpcmakeini : array[0..213,1..240] of char=( 'endif'#010+ #010+ '# Check for development version'#010+ - 'ifeq ($(LCLDIR),wrong)'#010+ - 'ov','erride LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ - 'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ + 'ifeq (','$(LCLDIR),wrong)'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Check for release version'#010+ - 'ifeq ($(LCLDIR),wrong)'#010+ - 'ov','erride LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildca'+ - 'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ + 'ifeq (','$(LCLDIR),wrong)'#010+ + 'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+ + ' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+ 'ifeq ($(LCLDIR),)'#010+ 'override LCLDIR=wrong'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Generate dirs'#010+ - 'override LCLUNITDIR:=$(wildcard $(L','CLDIR)/units/$(LCL_PLATFORM) $(LC'+ + 'override LCLUNIT','DIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LC'+ 'LDIR)/units)'#010+ 'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+ 'nts $(LCLDIR)/components)'#010+ 'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+ #010+ '# Add LCL dirs to paths'#010+ - 'override REQUIRE_PACKAGESDIR+=$(','LCLCOMPONENTDIR)'#010+ + 'override REQU','IRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+ 'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+ #010+ '[lclinforules]'#010+ '#####################################################################'#010+ '# LCL Info rules'#010+ - '#####################################################################'#010+ - 'override ','INFORULES+=lclinfo'#010+ + '############################################################','########'+ + '#'#010+ + 'override INFORULES+=lclinfo'#010+ #010+ '.PHONY: lclinfo'#010+ #010+ @@ -2309,7 +2313,7 @@ const fpcmakeini : array[0..213,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+ - ' @$(ECHO) LCL Unit dir........','. $(LCLUNITDIR)'#010+ + ' @$(ECHO) L','CL 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 02786a3641..2283112102 100644 --- a/utils/fpcm/fpcmake.ini +++ b/utils/fpcm/fpcmake.ini @@ -350,7 +350,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET)) endif # Packages dir -PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) +PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(FPCDIR)/packages/extra) [shelltools]