From b78c0f3413b0a07a6f2e697d0eb77e35ee7ee626 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 26 Jan 2000 21:16:26 +0000 Subject: [PATCH] * SMARTLINK=1 split into CREATESMART=1 and LINKSMART=1 * FPCDIR checks enhanced --- utils/fpcmake.inc | 543 ++++++++++++++++++++++++---------------------- utils/fpcmake.ini | 31 ++- utils/fpcmake.pp | 8 +- 3 files changed, 312 insertions(+), 270 deletions(-) diff --git a/utils/fpcmake.inc b/utils/fpcmake.inc index d847feb318..72a80d4e40 100644 --- a/utils/fpcmake.inc +++ b/utils/fpcmake.inc @@ -1,7 +1,7 @@ {$ifdef Delphi} -const fpcmakeini : array[0..118] of string[240]=( +const fpcmakeini : array[0..119] of string[240]=( {$else Delphi} -const fpcmakeini : array[0..118,1..240] of char=( +const fpcmakeini : array[0..119,1..240] of char=( {$endif Delphi} ';'#010+ '; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+ @@ -138,8 +138,10 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef FPCDIR'#010+ 'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+ 'ifeq ($(wildcard $(FPCD','IR)/rtl),)'#010+ + 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ + 'endif'#010+ 'else'#010+ 'override FPCDIR=wrong'#010+ 'endif'#010+ @@ -148,26 +150,40 @@ const fpcmakeini : array[0..118,1..240] of char=( '# Detect FPCDIR'#010+ 'ifeq ($(FPCDIR),wrong)'#010+ 'ifdef inlinux'#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)$(EXEEXT),,$(first','word $(strip $(wil'+ - 'dcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))'#010+ + 'override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildc'+ + 'ard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))'#010+ + 'override FPCDIR:=$(FPCDIR)/..'#010+ + 'ifeq',' ($(wildcard $(FPCDIR)/rtl),)'#010+ + 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ + 'override FPCDIR:=$(FPCDIR)/..'#010+ + 'ifeq ($(wildcard $(FPCDIR)/rtl),)'#010+ + 'ifeq ($(wildcard $(FPCDIR)/units),)'#010+ + 'override FPCDIR=wrong'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ + 'endif'#010+ 'endif'#010+ 'endif'#010+ #010+ '[fpcdirsubs]'#010+ - '# Create units dir'#010+ + '# ','Create units dir'#010+ 'ifneq ($(FPCDIR),.)'#010+ 'UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)'#010+ 'endif'#010+ #010+ '[checkfpcdirsubs]'#010+ - '# Check if the dirs really exists, else ','turn it off'#010+ + '# Check if the dirs really exists, else turn it off'#010+ 'ifeq ($(wildcard $(UNITSDIR)),)'#010+ 'UNITSDIR='#010+ 'endif'#010+ 'ifeq ($(wildcard $(TOOLKITSDIR)),)'#010+ - 'TOOLKITSDIR='#010+ + 'TOOLK','ITSDIR='#010+ 'endif'#010+ 'ifeq ($(wildcard $(PACKAGESDIR)),)'#010+ 'PACKAGESDIR='#010+ @@ -177,37 +193,37 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ #010+ - '[presettings',']'#010+ + '[presettings]'#010+ '#####################################################################'#010+ '# Pre Settings'#010+ - '#####################################################################'#010+ + '#############','#######################################################'+ + '#'#010+ #010+ #010+ '[usersettings]'#010+ - '##################################################################','##'+ - '#'#010+ + '#####################################################################'#010+ '# User Settings'#010+ '#####################################################################'#010+ #010+ #010+ - '[postsettings]'#010+ + '[postset','tings]'#010+ '#####################################################################'#010+ '# Post Settings'#010+ - '###############################################','#####################'+ - '#'#010+ + '#####################################################################'#010+ #010+ #010+ '[shelltools]'#010+ - '#####################################################################'#010+ + '##############################################################','######'+ + '#'#010+ '# Shell tools'#010+ '#####################################################################'#010+ #010+ '# echo'#010+ 'ifndef ECHO'#010+ - 'ECHO:=$(strip $(wildcard $(a','ddsuffix /gecho$(EXEEXT),$(SEARCHPATH)))'+ - ')'#010+ + 'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHPATH))))'#010+ 'ifeq ($(ECHO),)'#010+ - 'ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))'#010+ + 'ECHO:=$(strip $(wildcard $(addsuffix /echo','$(EXEEXT),$(SEARCHPATH))))'+ + #010+ 'ifeq ($(ECHO),)'#010+ 'ECHO:=echo'#010+ 'ECHOE:=echo'#010+ @@ -216,7 +232,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ECHOE=$(ECHO) -E'#010+ 'endif'#010+ 'else'#010+ - 'ECHO:=$(firstw','ord $(ECHO))'#010+ + 'ECHO:=$(firstword $(ECHO))'#010+ 'ECHOE=$(ECHO) -E'#010+ 'endif'#010+ 'endif'#010+ @@ -226,7 +242,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'COPY:=cp -fp'#010+ 'endif'#010+ #010+ - '# Copy a whole tree'#010+ + '# Copy ','a whole tree'#010+ 'ifndef COPYTREE'#010+ 'COPYTREE:=cp -rfp'#010+ 'endif'#010+ @@ -238,7 +254,7 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# Check delete program'#010+ 'ifndef DEL'#010+ - 'DEL',':=rm -f'#010+ + 'DEL:=rm -f'#010+ 'endif'#010+ #010+ '# Check deltree program'#010+ @@ -247,7 +263,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ '# To install files'#010+ - 'ifndef INSTALL'#010+ + 'ifnd','ef INSTALL'#010+ 'ifdef inlinux'#010+ 'INSTALL:=install -m 644'#010+ 'else'#010+ @@ -258,7 +274,7 @@ const fpcmakeini : array[0..118,1..240] of char=( '# To install programs'#010+ 'ifndef INSTALLEXE'#010+ 'ifdef inlinux'#010+ - 'IN','STALLEXE:=install -m 755'#010+ + 'INSTALLEXE:=install -m 755'#010+ 'else'#010+ 'INSTALLEXE:=$(COPY)'#010+ 'endif'#010+ @@ -266,24 +282,25 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# To make a directory.'#010+ 'ifndef MKDIR'#010+ - 'ifdef inlinux'#010+ + 'i','fdef inlinux'#010+ 'MKDIR:=install -m 755 -d'#010+ 'else'#010+ 'MKDIR:=ginstall -m 755 -d'#010+ 'endif'#010+ 'endif'#010+ #010+ - 'export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL I','NSTALLEXE '+ - 'MKDIR'#010+ + 'export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MK'+ + 'DIR'#010+ #010+ #010+ '[tool_default]'#010+ - '#####################################################################'#010+ + '###################################################################','#'+ + '#'#010+ '# Default Tools'#010+ '#####################################################################'#010+ #010+ '# assembler, redefine it if cross compiling'#010+ - 'ifndef',' AS'#010+ + 'ifndef AS'#010+ 'AS=as'#010+ 'endif'#010+ #010+ @@ -293,7 +310,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ '# ppas.bat / ppas.sh'#010+ - 'ifdef inlinux'#010+ + 'ifdef i','nlinux'#010+ 'PPAS=ppas.sh'#010+ 'else'#010+ 'ifdef inOS2'#010+ @@ -305,7 +322,7 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '# ldconfig to rebuild .so cache'#010+ 'ifdef inlinux'#010+ - 'LDCONFIG=ld','config'#010+ + 'LDCONFIG=ldconfig'#010+ 'else'#010+ 'LDCONFIG='#010+ 'endif'#010+ @@ -313,8 +330,8 @@ const fpcmakeini : array[0..118,1..240] of char=( '[tool_ppdep]'#010+ '# ppdep'#010+ 'ifndef PPDEP'#010+ - 'PPDEP:=$(strip $(wildcard $(addsuffix /ppdep$(EXEEXT),$(SEARCHPATH))))'+ - #010+ + 'PPDEP:=$(strip $(wildcard $(addsuffix',' /ppdep$(EXEEXT),$(SEARCHPATH))'+ + '))'#010+ 'ifeq ($(PPDEP),)'#010+ 'PPDEP='#010+ 'else'#010+ @@ -324,11 +341,11 @@ const fpcmakeini : array[0..118,1..240] of char=( 'export PPDEP'#010+ #010+ '[tool_ppumove]'#010+ - '# ppumo','ve'#010+ + '# ppumove'#010+ 'ifndef PPUMOVE'#010+ 'PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH'+ '))))'#010+ - 'ifeq ($(PPUMOVE),)'#010+ + 'ifeq ($','(PPUMOVE),)'#010+ 'PPUMOVE='#010+ 'else'#010+ 'PPUMOVE:=$(firstword $(PPUMOVE))'#010+ @@ -339,11 +356,11 @@ const fpcmakeini : array[0..118,1..240] of char=( '[tool_ppufiles]'#010+ '# ppufiles'#010+ 'ifndef PPUFILES'#010+ - 'PPUFILES:=','$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCH'+ - 'PATH))))'#010+ + 'PPUFILES:=$(strip $(wildcard $(addsuffix /ppufiles$(EXEEXT),$(SEARCHPA'+ + 'TH))))'#010+ 'ifeq ($(PPUFILES),)'#010+ 'PPUFILES='#010+ - 'else'#010+ + 'els','e'#010+ 'PPUFILES:=$(firstword $(PPUFILES))'#010+ 'endif'#010+ 'endif'#010+ @@ -352,12 +369,12 @@ const fpcmakeini : array[0..118,1..240] of char=( '[tool_data2inc]'#010+ '# data2inc'#010+ 'ifndef DATA2INC'#010+ - 'DATA2INC:=$(strip $(wildcard $(','addsuffix /data2inc$(EXEEXT),$(SEARCH'+ - 'PATH))))'#010+ + 'DATA2INC:=$(strip $(wildcard $(addsuffix /data2inc$(EXEEXT),$(SEARCHPA'+ + 'TH))))'#010+ 'ifeq ($(DATA2INC),)'#010+ 'DATA2INC='#010+ 'else'#010+ - 'DATA2INC:=$(firstword $(DATA2INC))'#010+ + 'DATA2INC:=$(firstwo','rd $(DATA2INC))'#010+ 'endif'#010+ 'endif'#010+ 'export DATA2INC'#010+ @@ -365,8 +382,7 @@ const fpcmakeini : array[0..118,1..240] of char=( '[tool_diff]'#010+ '# diff'#010+ 'ifndef DIFF'#010+ - 'DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH','))))'+ - #010+ + 'DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH))))'#010+ 'ifeq ($(DIFF),)'#010+ 'DIFF='#010+ 'else'#010+ @@ -376,7 +392,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'export DIFF'#010+ #010+ '[tool_cmp]'#010+ - '# cmp'#010+ + '# cmp',#010+ 'ifndef CMP'#010+ 'CMP:=$(strip $(wildcard $(addsuffix /cmp$(EXEEXT),$(SEARCHPATH))))'#010+ 'ifeq ($(CMP),)'#010+ @@ -384,13 +400,13 @@ const fpcmakeini : array[0..118,1..240] of char=( 'else'#010+ 'CMP:=$(firstword $(CMP))'#010+ 'endif'#010+ - 'endif',#010+ + 'endif'#010+ 'export CMP'#010+ #010+ '[tool_sed]'#010+ '# Sed'#010+ 'ifndef SED'#010+ - 'SED:=$(strip $(wildcard $(addsuffix /sed$(EXEEXT),$(SEARCHPATH))))'#010+ + 'SED:=$(strip $(wildcard $(addsuffix /sed$(EXEEXT),$(SEARCHP','ATH))))'#010+ 'ifeq ($(SED),)'#010+ 'SED='#010+ 'else'#010+ @@ -400,19 +416,19 @@ const fpcmakeini : array[0..118,1..240] of char=( 'export SED'#010+ #010+ '[tool_upx]'#010+ - '# Look if UPX is found for go32v2 and win32. We',' can'#039't use $UPX b'+ - 'ecuase'#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+ - 'UPXPROG:=1'#010+ + 'U','PXPROG:=1'#010+ 'endif'#010+ 'ifeq ($(OS_TARGET),win32)'#010+ 'UPXPROG:=1'#010+ 'endif'#010+ 'ifdef UPXPROG'#010+ - 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH)',')'+ - '))'#010+ + 'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))'+ + #010+ 'ifeq ($(UPXPROG),)'#010+ 'UPXPROG='#010+ 'else'#010+ @@ -421,19 +437,19 @@ const fpcmakeini : array[0..118,1..240] of char=( 'else'#010+ 'UPXPROG='#010+ 'endif'#010+ - 'endif'#010+ + 'endi','f'#010+ 'export UPXPROG'#010+ #010+ '[tool_date]'#010+ '# gdate/date'#010+ 'ifndef DATE'#010+ 'DATE:=$(strip $(wildcard $(addsuffix /date$(EXEEXT),$(SEARCHPATH))))'#010+ - 'ifeq ($(DATE),)'#010, + 'ifeq ($(DATE),)'#010+ 'DATE:=$(strip $(wildcard $(addsuffix /gdate$(EXEEXT),$(SEACHPATH))))'#010+ 'ifeq ($(DATE),)'#010+ 'DATE='#010+ 'else'#010+ - 'DATE:=$(firstword $(DATE))'#010+ + 'DATE',':=$(firstword $(DATE))'#010+ 'endif'#010+ 'else'#010+ 'DATE:=$(firstword $(DATE))'#010+ @@ -444,21 +460,21 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef DATE'#010+ 'DATESTR:=$(shell $(DATE) +%Y%m%d)'#010+ 'else'#010+ - 'DATE','STR='#010+ + 'DATESTR='#010+ 'endif'#010+ #010+ '[tool_zip]'#010+ '# ZipProg, you can'#039't use Zip as the var name (PFV)'#010+ 'ifndef ZIPPROG'#010+ - 'ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))))'+ - #010+ + 'ZIPPROG:=$(','strip $(wildcard $(addsuffix /zip$(EXEEXT),$(SEARCHPATH))'+ + '))'#010+ 'ifeq ($(ZIPPROG),)'#010+ 'ZIPPROG='#010+ 'else'#010+ 'ZIPPROG:=$(firstword $(ZIPPROG))'#010+ 'endif'#010+ 'endif'#010+ - 'ex','port ZIPPROG'#010+ + 'export ZIPPROG'#010+ #010+ 'ZIPOPT=-9'#010+ 'ZIPEXT=.zip'#010+ @@ -466,8 +482,8 @@ const fpcmakeini : array[0..118,1..240] of char=( '[tool_tar]'#010+ '# Tar'#010+ 'ifndef TARPROG'#010+ - 'TARPROG:=$(strip $(wildcard $(addsuffix /tar$(EXEEXT),$(SEARCHPATH))))'+ - #010+ + 'TARPROG:=$(strip $(wildcard $(a','ddsuffix /tar$(EXEEXT),$(SEARCHPATH))'+ + '))'#010+ 'ifeq ($(TARPROG),)'#010+ 'TARPROG='#010+ 'else'#010+ @@ -476,7 +492,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ 'export TARPROG'#010+ #010+ - 'ifeq (','$(USETAR),bz2)'#010+ + 'ifeq ($(USETAR),bz2)'#010+ 'TAROPT=vI'#010+ 'TAREXT=.tar.bz2'#010+ 'else'#010+ @@ -486,16 +502,16 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[extensions]'#010+ - '#####################################################################'#010+ - '# Default extensions'#010+ - '#########################################################','###########'+ + '########','############################################################'+ '#'#010+ + '# Default extensions'#010+ + '#####################################################################'#010+ #010+ '# Default needed extensions (Go32v2,Linux)'#010+ 'LOADEREXT=.as'#010+ 'PPLEXT=.ppl'#010+ 'PPUEXT=.ppu'#010+ - 'OEXT=.o'#010+ + 'OEXT=','.o'#010+ 'ASMEXT=.s'#010+ 'SMARTEXT=.sl'#010+ 'STATICLIBEXT=.a'#010+ @@ -506,7 +522,7 @@ const fpcmakeini : array[0..118,1..240] of char=( '# Go32v1'#010+ 'ifeq ($(OS_TARGET),go32v1)'#010+ 'PPUEXT=.pp1'#010+ - 'OEXT','=.o1'#010+ + 'OEXT=.o1'#010+ 'ASMEXT=.s1'#010+ 'SMARTEXT=.sl1'#010+ 'STATICLIBEXT=.a1'#010+ @@ -514,7 +530,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'FPCMADE=fpcmade.v1'#010+ 'endif'#010+ #010+ - '# Go32v2'#010+ + '# Go32v2'#010, 'ifeq ($(OS_TARGET),go32v2)'#010+ 'FPCMADE=fpcmade.dos'#010+ 'endif'#010+ @@ -525,14 +541,14 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ '# Win32'#010+ - 'ifeq ($(OS_TARGET','),win32)'#010+ + 'ifeq ($(OS_TARGET),win32)'#010+ 'PPUEXT=.ppw'#010+ 'OEXT=.ow'#010+ 'ASMEXT=.sw'#010+ 'SMARTEXT=.slw'#010+ 'STATICLIBEXT=.aw'#010+ 'SHAREDLIBEXT=.dll'#010+ - 'FPCMADE=fpcmade.w32'#010+ + 'FPCMADE=fp','cmade.w32'#010+ 'endif'#010+ #010+ '# OS/2'#010+ @@ -543,7 +559,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'SMARTEXT=.so'#010+ 'STATICLIBEXT=.ao2'#010+ 'SHAREDLIBEXT=.dll'#010+ - 'FPCMADE=f','pcmade.os2'#010+ + 'FPCMADE=fpcmade.os2'#010+ 'endif'#010+ #010+ '# library prefix'#010+ @@ -551,18 +567,18 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifeq ($(OS_TARGET),go32v2)'#010+ 'LIBPREFIX='#010+ 'endif'#010+ - 'ifeq ($(OS_TARGET),go32v1)'#010+ + 'ifeq ($','(OS_TARGET),go32v1)'#010+ 'LIBPREFIX='#010+ 'endif'#010+ #010+ '# determine which .pas extension is used'#010+ 'ifndef PASEXT'#010+ 'ifdef EXEOBJECTS'#010+ - 'override TESTPAS:=$(strip $(wi','ldcard $(addsuffix .pas,$(firstword $('+ - 'EXEOBJECTS)))))'#010+ + 'override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(EX'+ + 'EOBJECTS)))))'#010+ 'else'#010+ - 'override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(UN'+ - 'ITOBJECTS)))))'#010+ + 'override TESTPAS:=$(strip $(wildcard $(ad','dsuffix .pas,$(firstword $('+ + 'UNITOBJECTS)))))'#010+ 'endif'#010+ 'ifeq ($(TESTPAS),)'#010+ 'PASEXT=.pp'#010+ @@ -573,14 +589,14 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[dir_default]'#010+ - '###############','#####################################################'+ - '#'#010+ - '# Default Directories'#010+ '#####################################################################'#010+ + '# Default Directories'#010+ + '#######################','#############################################'+ + '#'#010+ #010+ '# set the prefix directory where to install everything'#010+ 'ifndef PREFIXINSTALLDIR'#010+ - 'ifdef inlinux',#010+ + 'ifdef inlinux'#010+ 'PREFIXINSTALLDIR=/usr'#010+ 'else'#010+ 'PREFIXINSTALLDIR=/pp'#010+ @@ -588,7 +604,7 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ 'export PREFIXINSTALLDIR'#010+ #010+ - '# Where to place the resulting zip files'#010+ + '# Where to pla','ce the resulting zip files'#010+ 'ifndef DESTZIPDIR'#010+ 'DESTZIPDIR:=$(BASEDIR)'#010+ 'endif'#010+ @@ -596,41 +612,41 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[dir_install]'#010+ - '################################','####################################'+ - '#'#010+ - '# Install Directories'#010+ '#####################################################################'#010+ + '# Install Directories'#010+ + '########################################','############################'+ + '#'#010+ #010+ '# set the base directory where to install everything'#010+ 'ifndef BASEINSTALLDIR'#010+ 'ifdef inlinux'#010+ - 'BASEINSTALLDIR=$(PRE','FIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)'#010+ + 'BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)'#010+ 'else'#010+ 'BASEINSTALLDIR=$(PREFIXINSTALLDIR)'#010+ 'endif'#010+ 'endif'#010+ #010+ - '# set the directory where to install the binaries'#010+ + '# set the',' directory where to install the binaries'#010+ 'ifndef BININSTALLDIR'#010+ 'ifdef inlinux'#010+ 'BININSTALLDIR=$(PREFIXINSTALLDIR)/bin'#010+ 'else'#010+ - 'BININSTALLDIR=$(BASEI','NSTALLDIR)/bin/$(OS_TARGET)'#010+ + 'BININSTALLDIR=$(BASEINSTALLDIR)/bin/$(OS_TARGET)'#010+ 'endif'#010+ 'endif'#010+ #010+ '# set the directory where to install the units.'#010+ - 'ifndef UNITINSTALLDIR'#010+ + 'ifndef UNIT','INSTALLDIR'#010+ 'UNITINSTALLDIR=$(BASEINSTALLDIR)/units/$(OS_TARGET)'#010+ 'ifdef UNITSUBDIR'#010+ 'UNITINSTALLDIR:=$(UNITINSTALLDIR)/$(UNITSUBDIR)'#010+ 'endif'#010+ - 'endif'#010, + 'endif'#010+ #010+ '# Where to install shared libraries'#010+ 'ifndef LIBINSTALLDIR'#010+ 'ifdef inlinux'#010+ - 'LIBINSTALLDIR=$(PREFIXINSTALLDIR)/lib'#010+ + 'LIBINSTALLDIR=$(PREFIXINSTAL','LDIR)/lib'#010+ 'else'#010+ 'LIBINSTALLDIR=$(UNITINSTALLDIR)'#010+ 'endif'#010+ @@ -639,9 +655,9 @@ const fpcmakeini : array[0..118,1..240] of char=( '# Where the source files will be stored'#010+ 'ifndef SOURCEINSTALLDIR'#010+ 'ifdef inlinux'#010+ - 'SO','URCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)'#010+ + 'SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)'#010+ 'else'#010+ - 'SOURCEINSTALLDIR=$(BASEINSTALLDIR)/source'#010+ + 'SOURCEINSTALLDIR=$(BASEINSTALLDIR)/so','urce'#010+ 'endif'#010+ 'ifdef SOURCESUBDIR'#010+ 'SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)'#010+ @@ -649,24 +665,24 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ '# Where the doc files will be stored'#010+ - 'ifndef',' DOCINSTALLDIR'#010+ + 'ifndef DOCINSTALLDIR'#010+ 'ifdef inlinux'#010+ 'DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(FPC_VERSION)'#010+ 'else'#010+ - 'DOCINSTALLDIR=$(BASEINSTALLDIR)/doc'#010+ + 'DOCINSTAL','LDIR=$(BASEINSTALLDIR)/doc'#010+ 'endif'#010+ 'endif'#010+ #010+ '# Where the some extra (data)files will be stored'#010+ 'ifndef DATAINSTALLDIR'#010+ - 'DATAINSTALLDIR=$(BASEINSTALL','DIR)'#010+ + 'DATAINSTALLDIR=$(BASEINSTALLDIR)'#010+ 'endif'#010+ #010+ #010+ '[dir_gcclib]'#010+ '# On linux, try to find where libgcc.a is.'#010+ 'ifdef inlinux'#010+ - 'ifndef GCCLIBDIR'#010+ + 'ifndef GCCLIBDIR'#010, 'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{ print'+ ' $$4 } '#039'`)'#010+ 'endif'#010+ @@ -675,22 +691,23 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[dir_otherlib]'#010+ - '# Where to find o','ther libraries'#010+ + '# Where to find other libraries'#010+ 'ifdef inlinux'#010+ 'ifndef OTHERLIBDIR'#010+ - 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '#039'{ ORS=" '+ - '"; print $1 }'#039')'#010+ + 'OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf |',' awk '#039'{ ORS='+ + '" "; print $1 }'#039')'#010+ 'endif'#010+ 'endif'#010+ 'export OTHERLIBDIR'#010+ #010+ #010+ '[redir]'#010+ - '#####################################################################', - #010+ + '#####################################################################'#010+ '# Redirection'#010+ '#####################################################################'#010+ #010+ + '# Release ? Th','en force OPT and don'#039't use extra opts via commandl'+ + 'ine'#010+ 'ifndef REDIRFILE'#010+ 'REDIRFILE=log'#010+ 'endif'#010+ @@ -701,16 +718,16 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ '# set the verbosity to max'#010+ 'override FPCOPT+=-va'#010+ - 'overr','ide REDIR:= >> $(REDIRFILE)'#010+ - 'endif'#010+ + 'override REDIR:= >> $(REDIRFILE)'#010+ + 'endi','f'#010+ #010+ '[command_begin]'#010+ '#####################################################################'#010+ '# Compiler Command Line'#010+ '#####################################################################'#010+ #010+ - '# Load commandline OPTDE','F and add FPC_CPU define'#010+ - 'override FPCOPTDEF:=-d$(CPU_TARGET)'#010+ + '# Load commandline OPTDEF and add FPC_CPU define'#010+ + 'overrid','e FPCOPTDEF:=-d$(CPU_TARGET)'#010+ #010+ '# Load commandline OPT and add target and unit dir to be sure'#010+ 'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+ @@ -719,11 +736,11 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '[command_needopt]'#010+ 'ifdef NEEDOPT'#010+ - 'override FP','COPT+=$(NEEDOPT)'#010+ + 'override FPCOPT+=$(NEEDOPT)'#010+ 'endif'#010+ #010+ #010+ - '[command_needunit]'#010+ + '[comman','d_needunit]'#010+ 'ifdef NEEDUNITDIR'#010+ 'override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))'#010+ 'endif'#010+ @@ -737,7 +754,7 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '[command_needlib]'#010+ 'ifdef NEEDLIBDIR'#010+ - 'override FPC','OPT+=$(addprefix -Fl,$(NEEDLIBDIR))'#010+ + 'override FPCOPT+=$(addprefix -Fl,$(NEEDLIBDI','R))'#010+ 'endif'#010+ #010+ #010+ @@ -752,9 +769,9 @@ const fpcmakeini : array[0..118,1..240] of char=( 'override FPCOPT+=$(addprefix -Fi,$(NEEDINCDIR))'#010+ 'endif'#010+ #010+ - '[command_gcclib',']'#010+ + '[command_gcclib]'#010+ '# Add GCC lib path if asked'#010+ - 'ifdef GCCLIBDIR'#010+ + 'if','def GCCLIBDIR'#010+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+ 'endif'#010+ #010+ @@ -765,9 +782,9 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ '[command_target]'#010+ - '# Target dirs',#010+ + '# Target dirs'#010+ 'ifdef TARGETDIR'#010+ - 'override FPCOPT+=-FE$(TARGETDIR)'#010+ + 'override FPCOPT','+=-FE$(TARGETDIR)'#010+ 'endif'#010+ #010+ '[command_unittarget]'#010+ @@ -777,28 +794,28 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ '[command_end]'#010+ '# Smartlinking'#010+ - 'ifdef SMARTLINK'#010+ + 'ifdef LINKSMART'#010+ 'override FPCOPT+=-CX'#010+ 'endif'#010+ #010+ + '# Smartlinking'#010+ + 'ifdef CREATESMART'#010+ + 'override FPCOPT+=-XX'#010+ + 'end','if'#010+ + #010+ '# Debug'#010+ 'ifdef DEBUG'#010+ - 'overr','ide FPCOPT+=-g -dDEBUG'#010+ + 'override FPCOPT+=-g -dDEBUG'#010+ 'endif'#010+ #010+ '# Release mode (strip, optimize and don'#039't load ppc386.cfg)'#010+ - '# 0.99.12b has a bug in the optimizer so don'#039't use it by default'#010+ 'ifdef RELEASE'#010+ - 'ifeq ($(FPC_VERSION),0.99.12)'#010+ - 'override FPCOPT+=-Xs -OGp3 -n'#010+ - 'else'#010+ - 'overrid','e FPCOPT+=-Xs -OG2p3 -n'#010+ - 'endif'#010+ + 'override FPCOPT+=-Xs -OG2p3 -n'#010+ 'endif'#010+ #010+ '# Verbose settings (warning,note,info)'#010+ 'ifdef VERBOSE'#010+ - 'override FPCOPT+=-vwni'#010+ + 'override FPCOPT+=','-vwni'#010+ 'endif'#010+ #010+ '# Add commandline options'#010+ @@ -806,26 +823,26 @@ const fpcmakeini : array[0..118,1..240] of char=( 'override FPCOPT+=$(OPT)'#010+ 'endif'#010+ 'ifdef UNITDIR'#010+ - 'override FPCOPT+=$(addprefix -Fu,$(UNITD','IR))'#010+ + 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+ 'endif'#010+ 'ifdef LIBDIR'#010+ 'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+ 'endif'#010+ 'ifdef OBJDIR'#010+ - 'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+ + 'override FPCOPT+=$(a','ddprefix -Fo,$(OBJDIR))'#010+ 'endif'#010+ 'ifdef INCDIR'#010+ 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+ 'endif'#010+ #010+ - '# Add defines from FPCOPTDEF to FPCOPT'#010, + '# Add defines from FPCOPTDEF to FPCOPT'#010+ 'ifdef FPCOPTDEF'#010+ 'override FPCOPT+=$(FPCOPTDEF)'#010+ 'endif'#010+ #010+ '# Error file ?'#010+ 'ifdef ERRORFILE'#010+ - 'override FPCOPT+=-Fr$(ERRORFILE)'#010+ + 'override FPCOPT+=-Fr$(E','RRORFILE)'#010+ 'endif'#010+ #010+ '# Was a config file specified ?'#010+ @@ -835,30 +852,30 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[command_win32file]'#010+ - '# For win32 t','he options are passed using the file fpcext.cmd'#010+ + '# For win32 the options are passed using the file fpcext.cmd'#010+ 'ifndef FPCEXTFILE'#010+ 'FPCEXTFILE=fpcext.cmd'#010+ 'endif'#010+ - 'ifeq ($(OS_SOURCE),win32)'#010+ + 'ifeq ($(OS_SO','URCE),win32)'#010+ 'override TMPVAR:=$(shell "$(DEL) $(FPCEXTFILE)")'#010+ 'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $(F'+ - 'P','CEXTFILE)"))'#010+ + 'PCEXTFILE)"))'#010+ 'override FPCOPT:=@$(FPCEXTFILE)'#010+ 'endif'#010+ #010+ '[command_win32env]'#010+ - '# For win32 the options are passed using the environment FPCEXTCMD'#010+ + '# For win32 the options are passed u','sing the environment FPCEXTCMD'#010+ 'ifeq ($(OS_SOURCE),win32)'#010+ 'override FPCEXTCMD:=$(FPCOPT)'#010+ 'override FPCOPT:=!FPCEXTCMD'#010+ 'export FPCEXTCMD'#010+ - 'e','ndif'#010+ + 'endif'#010+ #010+ '[command_compiler]'#010+ '# Compiler commandline'#010+ 'override COMPILER:=$(FPC) $(FPCOPT)'#010+ #010+ - '# also call ppas if with command option -s'#010+ + '# also call ppas if wi','th command option -s'#010+ 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+ 'EXECPPAS='#010+ 'else'#010+ @@ -867,106 +884,107 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[standardrules]'#010+ - '################','####################################################'+ - '#'#010+ - '# Standard rules'#010+ '#####################################################################'#010+ + '# Standard rules'#010+ + '####################################','################################'+ + '#'#010+ #010+ '[packagedependrules]'#010+ '#####################################################################'#010+ - '# Packa','ge depends'#010+ + '# Package depends'#010+ '#####################################################################'#010+ #010+ #010+ '[loaderrules]'#010+ - '#####################################################################'#010+ - '# Loaders'#010+ - '###############################################################','#####'+ + '##########','##########################################################'+ '#'#010+ + '# Loaders'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_loaders'#010+ #010+ '%$(OEXT): %$(LOADEREXT)'#010+ ' $(AS) -o $*$(OEXT) $<'#010+ #010+ - 'override ALLTARGET+=fpc_loaders'#010+ + 'override ALLTARGET+=fpc','_loaders'#010+ 'override CLEANTARGET+=fpc_loaders_clean'#010+ 'override SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+ - 'override INSTALLTARGET+=fpc_load','ers_install'#010+ + 'override INSTALLTARGET+=fpc_loaders_install'#010+ #010+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+ #010+ 'fpc_loaders: $(LOADEROFILES)'#010+ #010+ - 'fpc_loaders_clean:'#010+ + 'fp','c_loaders_clean:'#010+ ' -$(DEL) $(LOADEROFILES)'#010+ #010+ 'fpc_loaders_showinstall:'#010+ - ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(L','OADEROFILE'+ - 'S))'#010+ + ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES)'+ + ')'#010+ #010+ 'fpc_loaders_install:'#010+ ' $(MKDIR) $(UNITINSTALLDIR)'#010+ - ' $(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)'#010+ + ' $(INSTALL) $(LOADEROFILES) $','(UNITINSTALLDIR)'#010+ #010+ #010+ '[unitrules]'#010+ '#####################################################################'#010+ '# Units'#010+ - '########################','############################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_units'#010+ #010+ 'override ALLTARGET+=fpc_units'#010+ #010+ - 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))'#010+ + 'override U','NITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))'#010+ 'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+ 'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+ - #010, + #010+ 'fpc_units: $(UNITPPUFILES)'#010+ #010+ #010+ #010+ '[exerules]'#010+ - '#####################################################################'#010+ + '##################################################################','##'+ + '#'#010+ '# Exes'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_exes'#010+ #010+ - 'override EXEFILES=$(addsuffix $(E','XEEXT),$(EXEOBJECTS))'#010+ + 'override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))'#010+ 'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+ #010+ 'override ALLTARGET+=fpc_exes'#010+ - 'override INSTALLEXEFILES+=$(EXEFILES)'#010+ + 'o','verride INSTALLEXEFILES+=$(EXEFILES)'#010+ 'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+ #010+ 'fpc_exes: $(EXEFILES)'#010+ #010+ #010+ '[rstrules]'#010+ - '###########','#########################################################'+ - '#'#010+ - '# Resource strings'#010+ '#####################################################################'#010+ + '# Resource strings'#010+ + '#############################','#######################################'+ + '#'#010+ #010+ 'override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))'#010+ #010+ - 'override CLEANRSTFILES+=$(RSTFILES)',#010+ + 'override CLEANRSTFILES+=$(RSTFILES)'#010+ #010+ #010+ '[examplerules]'#010+ '#####################################################################'#010+ '# Examples'#010+ - '#####################################################################'#010+ + '########','############################################################'+ + '#'#010+ #010+ '.PHONY: fpc_examples fpc_test'#010+ #010+ - 'override EXAMPLEFILES:=$(addsuffix $(EX','EEXT),$(EXAMPLEOBJECTS))'#010+ + 'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+ 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+ #010+ - 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ + 'override CLEANEXEF','ILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+ #010+ 'fpc_examples: all $(EXAMPLEFILES)'#010+ #010+ @@ -974,151 +992,151 @@ const fpcmakeini : array[0..118,1..240] of char=( #010+ #010+ '[compilerules]'#010+ - '######################','##############################################'+ - '#'#010+ - '# General compile rules'#010+ '#####################################################################'#010+ + '# General compile rules'#010+ + '###################################','#################################'+ + '#'#010+ #010+ '.PHONY: fpc_packages fpc_all fpc_debug'#010+ #010+ '$(FPCMADE): $(ALLTARGET)'#010+ - ' @$(ECHO) Compiled > $(FP','CMADE)'#010+ + ' @$(ECHO) Compiled > $(FPCMADE)'#010+ #010+ 'fpc_packages: $(COMPILEPACKAGES)'#010+ #010+ 'fpc_all: fpc_packages $(FPCMADE)'#010+ #010+ 'fpc_debug:'#010+ - ' $(MAKE) all DEBUG=1'#010+ + ' $(MAKE) all ','DEBUG=1'#010+ #010+ '# General compile rules, available for both possible PASEXT'#010+ #010+ '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+ #010+ - '%$(PPUEXT): %.','pp'#010+ + '%$(PPUEXT): %.pp'#010+ ' $(COMPILER) $< $(REDIR)'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(PPUEXT): %.pas'#010+ ' $(COMPILER) $< $(REDIR)'#010+ - ' $(EXECPPAS)'#010+ + ' ',' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pp'#010+ ' $(COMPILER) $< $(REDIR)'#010+ ' $(EXECPPAS)'#010+ #010+ '%$(EXEEXT): %.pas'#010+ - ' $(COMPILER) $< $(','REDIR)'#010+ + ' $(COMPILER) $< $(REDIR)'#010+ ' $(EXECPPAS)'#010+ #010+ #010+ '[libraryrules]'#010+ - '#####################################################################'#010+ + '###############################################################','#####'+ + '#'#010+ '# Library'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_smart fpc_shared'#010+ #010+ - '# Default share','dlib units are all unit objects'#010+ + '# Default sharedlib units are all unit objects'#010+ 'ifndef SHAREDLIBUNITOBJECTS'#010+ 'SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+ 'endif'#010+ #010+ - 'fpc_smart:'#010+ - ' $(MAKE) all SMARTLINK=1'#010+ + 'fpc','_smart:'#010+ + ' $(MAKE) all LINKSMART=1 CREATESMART=1'#010+ #010+ 'fpc_shared: all'#010+ 'ifdef inlinux'#010+ 'ifndef LIBNAME'#010+ ' @$(ECHO) "LIBNAME not set"'#010+ 'else'#010+ - ' ',' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+ + ' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+ 'endif'#010+ 'else'#010+ - ' @$(ECHO) "Shared Libraries not supported"'#010+ + ' @$(ECHO) "Shared Librarie','s not supported"'#010+ 'endif'#010+ #010+ #010+ '[installrules]'#010+ '#####################################################################'#010+ '# Install rules'#010+ - '#####################','###############################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_showinstall fpc_install'#010+ #010+ - 'ifdef EXTRAINSTALLUNITS'#010+ + 'ifdef ','EXTRAINSTALLUNITS'#010+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+ 'endif'#010+ #010+ 'ifdef INSTALLPPUFILES'#010+ 'ifdef PPUFILES'#010+ 'ifdef inlinux'#010+ - 'I','NSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+ - 'INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+ + 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+ + 'INSTALLPPULIBFILES:=$(shell',' $(PPUFILES) -L $(INSTALLPPUFILES))'#010+ 'else'#010+ 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+ 'endif'#010+ 'else'#010+ - 'INSTALLPPULINKFILES:=$(wildcard $(','subst $(PPUEXT),$(OEXT),$(INSTALLP'+ - 'PUFILES)))'#010+ + 'INSTALLPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+ + 'FILES)))'#010+ 'endif'#010+ 'endif'#010+ #010+ - 'fpc_showinstall: $(SHOWINSTALLTARGET)'#010+ + 'fpc_showinstall: $(SHOWINSTALLTARGE','T)'#010+ 'ifdef INSTALLEXEFILES'#010+ ' @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+ 'S))'#010+ 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ - ' @$(ECHO) -e ','$(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUF'+ - 'ILES))'#010+ + ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+ + 'ES))'#010+ 'ifneq ($(INSTALLPPULINKFILES),)'#010+ - ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+ - 'KFILES))'#010+ + ' ',' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUL'+ + 'INKFILES))'#010+ 'endif'#010+ 'ifneq ($(INSTALLPPULIBFILES),)'#010+ - ' @$(ECHO) -e $(addprefix "\n"$','(LIBINSTALLDIR)/,$(INSTALLPPULI'+ - 'BFILES))'#010+ + ' @$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBF'+ + 'ILES))'#010+ 'endif'#010+ 'endif'#010+ 'ifdef EXTRAINSTALLFILES'#010+ - ' @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+ - 'ILES))'#010+ + ' @$(ECHO) ','-e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTAL'+ + 'LFILES))'#010+ 'endif'#010+ #010+ 'fpc_install: $(INSTALLTARGET)'#010+ '# Create UnitInstallFiles'#010+ 'ifdef INSTALLEXEFILES'#010+ - ' ',' $(MKDIR) $(BININSTALLDIR)'#010+ + ' $(MKDIR) $(BININSTALLDIR)'#010+ '# Compress the exes if upx is defined'#010+ 'ifdef UPXPROG'#010+ - ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+ + ' -','$(UPXPROG) $(INSTALLEXEFILES)'#010+ 'endif'#010+ ' $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+ 'endif'#010+ 'ifdef INSTALLPPUFILES'#010+ - ' $(MKDIR) $(UNITIN','STALLDIR)'#010+ + ' $(MKDIR) $(UNITINSTALLDIR)'#010+ ' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+ - 'ifneq ($(INSTALLPPULINKFILES),)'#010+ + 'ifneq ($(INSTALLPPULINKFILE','S),)'#010+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+ 'endif'#010+ 'ifneq ($(INSTALLPPULIBFILES),)'#010+ ' $(MKDIR) $(LIBINSTALLDIR)'#010+ - ' $(I','NSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+ + ' $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+ 'endif'#010+ 'endif'#010+ 'ifdef EXTRAINSTALLFILES'#010+ - ' $(MKDIR) $(DATAINSTALLDIR)'#010+ + ' $(','MKDIR) $(DATAINSTALLDIR)'#010+ ' $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+ 'endif'#010+ #010+ #010+ '[sourceinstallrules]'#010+ - '###################################','#################################'+ - '#'#010+ - '# SourceInstall rules'#010+ '#####################################################################'#010+ + '# SourceInstall rules'#010+ + '####################################','################################'+ + '#'#010+ #010+ '.PHONY: fpc_sourceinstall'#010+ #010+ @@ -1127,21 +1145,20 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ #010+ 'fpc_sourceinstall: clean'#010+ - ' $','(MKDIR) $(SOURCEINSTALLDIR)'#010+ + ' $(MKDIR) $(SOURCEINSTALLDIR)'#010+ ' $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)'#010+ #010+ #010+ - '[zipinstallrules]'#010+ + '[zipins','tallrules]'#010+ '#####################################################################'#010+ '# Zip'#010+ - '############################################################','########'+ - '#'#010+ + '#####################################################################'#010+ #010+ '.PHONY: fpc_zipinstall'#010+ #010+ '# Create suffix to add'#010+ 'ifndef PACKAGESUFFIX'#010+ - 'PACKAGESUFFIX=$(OS_TARGET)'#010+ + 'PACKAGESUFFIX=','$(OS_TARGET)'#010+ 'ifeq ($(OS_TARGET),go32v2)'#010+ 'PACKAGESUFFIX=go32'#010+ 'endif'#010+ @@ -1150,19 +1167,19 @@ const fpcmakeini : array[0..118,1..240] of char=( 'endif'#010+ 'endif'#010+ #010+ - '# Temporary path to pack ','a file'#010+ + '# Temporary path to pack a file'#010+ 'ifndef PACKDIR'#010+ 'ifndef inlinux'#010+ 'PACKDIR=$(BASEDIR)/pack_tmp'#010+ 'else'#010+ 'PACKDIR=/tmp/fpc-pack'#010+ - 'endif'#010+ + 'e','ndif'#010+ 'endif'#010+ #010+ '# Maybe create default zipname from packagename'#010+ 'ifndef ZIPNAME'#010+ 'ifdef PACKAGENAME'#010+ - 'ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX)',#010+ + 'ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX)'#010+ 'endif'#010+ 'endif'#010+ #010+ @@ -1171,23 +1188,23 @@ const fpcmakeini : array[0..118,1..240] of char=( 'ifdef inlinux'#010+ 'USETAR=1'#010+ 'endif'#010+ - 'endif'#010+ + 'end','if'#010+ #010+ 'fpc_zipinstall:'#010+ 'ifndef ZIPNAME'#010+ ' @$(ECHO) "Please specify ZIPNAME!"'#010+ ' @exit 1'#010+ 'else'#010+ - ' $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(','PACKDIR)'#010+ + ' $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+ 'ifdef USETAR'#010+ ' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+ - ' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(Z'+ - 'IPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+ + ' cd $(PACKDIR) ','; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$'+ + '(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+ 'else'#010+ ' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)'#010+ - ' cd',' $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIP'+ - 'NAME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+ - 'endif'#010+ + ' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+ + 'ME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+ + 'en','dif'#010+ ' $(DELTREE) $(PACKDIR)'#010+ 'endif'#010+ #010+ @@ -1196,91 +1213,94 @@ const fpcmakeini : array[0..118,1..240] of char=( '.PHONY: fpc_zipsourceinstall'#010+ #010+ 'fpc_zipsourceinstall:'#010+ - ' $(MAKE) fpc_zipinsta','ll ZIPTARGET=sourceinstall PACKAGESUFFIX'+ - '=src'#010+ + ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall PACKAGESUFFIX=s'+ + 'rc'#010+ #010+ #010+ '[cleanrules]'#010+ - '#####################################################################'#010+ + '#################################','###################################'+ + '#'#010+ '# Clean rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_clean fpc_cle','anall'#010+ + '.PHONY: fpc_clean fpc_cleanall'#010+ #010+ 'ifdef EXTRACLEANUNITS'#010+ - 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+ + 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS)',')'#010+ 'endif'#010+ #010+ 'ifdef CLEANPPUFILES'#010+ 'ifdef PPUFILES'#010+ 'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+ 'else'#010+ - 'CLEANPPULINKFILES:=$(wildcard $(subst $(P','PUEXT),$(OEXT),$(CLEANPPUFI'+ - 'LES)))'#010+ + 'CLEANPPULINKFILES:=$(wildcard $(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILE'+ + 'S)))'#010+ 'endif'#010+ 'endif'#010+ #010+ 'fpc_clean: $(CLEANTARGET)'#010+ - 'ifdef CLEANEXEFILES'#010+ + 'ifdef CLEANEXEFILES'#010, ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ 'ifdef CLEANPPUFILES'#010+ ' -$(DEL) $(CLEANPPUFILES)'#010+ 'endif'#010+ 'ifneq ($(CLEANPPULINKFILES),)'#010+ - ' -$(DEL) $(C','LEANPPULINKFILES)'#010+ + ' -$(DEL) $(CLEANPPULINKFILES)'#010+ 'endif'#010+ 'ifdef CLEANRSTFILES'#010+ ' -$(DEL) $(CLEANRSTFILES)'#010+ 'endif'#010+ - 'ifdef EXTRACLEANFILES'#010+ + 'ifdef EXTR','ACLEANFILES'#010+ ' -$(DEL) $(EXTRACLEANFILES)'#010+ 'endif'#010+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+ #010+ #010+ - 'fpc_cleanall: $(CLEANT','ARGET)'#010+ + 'fpc_cleanall: $(CLEANTARGET)'#010+ 'ifdef CLEANEXEFILES'#010+ ' -$(DEL) $(CLEANEXEFILES)'#010+ 'endif'#010+ - ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+ - 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ + ' -$(DEL) *$(OEXT) *$','(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICL'+ + 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+ ' -$(DELTREE) *$(SMARTEXT)'#010+ - ' -$(DEL) $(FPCMADE) $(PPAS) lin','k.res $(FPCEXTFILE) $(REDIRFIL'+ - 'E)'#010+ + ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+ + #010+ #010+ #010+ '[dependrules]'#010+ - '#####################################################################'#010+ + '############################################','########################'+ + '#'#010+ '# Depend rules'#010+ '#####################################################################'#010+ #010+ '.PHONY: fpc_depend'#010+ #010+ 'fpc_depend:'#010+ - ' ',' $(PPDEP) $(UNITOBJECTS)'#010+ + ' $(PPDEP) $(UNITOBJECTS)'#010+ #010+ #010+ '[inforules]'#010+ - '#####################################################################'#010+ + '##################################################','##################'+ + '#'#010+ '# Info rules'#010+ '#####################################################################'#010+ #010+ - '.PHONY: fpc_info fpc_cfginfo fpc_objectinfo',' fpc_toolsinfo fpc_instal'+ - 'linfo \'#010+ + '.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installi'+ + 'nfo \'#010+ ' fpc_dirinfo'#010+ #010+ 'fpc_info: $(INFOTARGET)'#010+ #010+ '[info_cfg]'#010+ - 'fpc_infocfg:'#010+ + 'fpc','_infocfg:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Configuration info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) FPC....... $(FPC)'#010+ - ' @$(ECHO) Versio','n... $(FPC_VERSION)'#010+ + ' @$(ECHO) Version... $(FPC_VERSION)'#010+ ' @$(ECHO) CPU....... $(CPU_TARGET)'#010+ - ' @$(ECHO) Source.... $(OS_SOURCE)'#010+ + ' @$(ECHO) Source.... $','(OS_SOURCE)'#010+ ' @$(ECHO) Target.... $(OS_TARGET)'#010+ ' @$(ECHO)'#010+ #010+ @@ -1288,19 +1308,19 @@ const fpcmakeini : array[0..118,1..240] of char=( 'fpc_infodirs:'#010+ 'ifdef inlinux'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ','== Directory info =='#010+ + ' @$(ECHO) == Directory info =='#010+ ' @$(ECHO)'#010+ 'ifdef NEEDGCCLIB'#010+ - ' @$(ECHO) GCC library is needed.'#010+ + ' @$(ECHO) GCC library is neede','d.'#010+ 'endif'#010+ 'ifdef NEEDOTHERLIB'#010+ ' @$(ECHO) Other library is needed.'#010+ 'endif'#010+ ' @$(ECHO) Basedir......... $(BASEDIR)'#010+ ' @$(ECHO)'#010+ - ' ',' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ + ' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+ ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+ - ' @$(ECHO)'#010+ + ' ',' @$(ECHO)'#010+ 'endif'#010+ #010+ '[info_tools]'#010+ @@ -1308,10 +1328,10 @@ const fpcmakeini : array[0..118,1..240] of char=( ' @$(ECHO)'#010+ ' @$(ECHO) == Tools info =='#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) Pwd.......',' $(PWD)'#010+ + ' @$(ECHO) Pwd....... $(PWD)'#010+ ' @$(ECHO) Echo...... $(ECHO)'#010+ 'ifdef PPDEP'#010+ - ' @$(ECHO) PPDep..... $(PPDEP)'#010+ + ' @$(ECHO) PPDep..... $(PPDEP',')'#010+ 'endif'#010+ 'ifdef PPUMOVE'#010+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+ @@ -1320,11 +1340,11 @@ const fpcmakeini : array[0..118,1..240] of char=( ' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+ 'endif'#010+ 'ifdef DATA2INC'#010+ - ' ',' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+ + ' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+ 'endif'#010+ 'ifdef SED'#010+ ' @$(ECHO) Sed....... $(SED)'#010+ - 'endif'#010+ + 'en','dif'#010+ 'ifdef DATE'#010+ ' @$(ECHO) Date...... $(DATE)'#010+ 'endif'#010+ @@ -1332,80 +1352,79 @@ const fpcmakeini : array[0..118,1..240] of char=( ' @$(ECHO) Diff...... $(DIFF)'#010+ 'endif'#010+ 'ifdef CMP'#010+ - ' @$(ECHO) Cmp....','... $(CMP)'#010+ + ' @$(ECHO) Cmp....... $(CMP)'#010+ 'endif'#010+ 'ifdef UPXPROG'#010+ ' @$(ECHO) Upx....... $(UPXPROG)'#010+ 'endif'#010+ 'ifdef ZIPPROG'#010+ - ' @$(ECHO) Zip....... $(ZIPPROG)'#010+ + ' ',' @$(ECHO) Zip....... $(ZIPPROG)'#010+ 'endif'#010+ ' @$(ECHO)'#010+ #010+ '[info_objects]'#010+ 'fpc_infoobjects:'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) == Object info =='#010, + ' @$(ECHO) == Object info =='#010+ ' @$(ECHO)'#010+ ' @$(ECHO) LoaderObjects..... $(LOADEROBJECTS)'#010+ - ' @$(ECHO) UnitObjects....... $(UNITOBJECTS)'#010+ + ' @$(ECHO) Unit','Objects....... $(UNITOBJECTS)'#010+ ' @$(ECHO) ExeObjects........ $(EXEOBJECTS)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ExtraCleanUnits... $(EXTRACLEAN','UNITS)'#010+ + ' @$(ECHO) ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+ ' @$(ECHO) ExtraCleanFiles... $(EXTRACLEANFILES)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+ + ' @$(EC','HO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+ ' @$(ECHO) ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+ ' @$(ECHO)'#010+ #010+ '[info_install]'#010+ - 'fpc_infoins','tall:'#010+ + 'fpc_infoinstall:'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) == Install info =='#010+ ' @$(ECHO)'#010+ 'ifdef DATE'#010+ - ' @$(ECHO) DateStr.............. $(DATESTR)'#010+ + ' ',' @$(ECHO) DateStr.............. $(DATESTR)'#010+ 'endif'#010+ 'ifdef PACKAGEPREFIX'#010+ ' @$(ECHO) PackagePrefix........ $(PACKAGEPREFIX)'#010+ 'endif'#010+ - 'ifdef PACKAG','ENAME'#010+ + 'ifdef PACKAGENAME'#010+ ' @$(ECHO) PackageName.......... $(PACKAGENAME)'#010+ 'endif'#010+ - ' @$(ECHO) PackageSuffix........ $(PACKAGESUFFIX)'#010+ + ' @$(ECHO) PackageS','uffix........ $(PACKAGESUFFIX)'#010+ ' @$(ECHO)'#010+ ' @$(ECHO) BaseInstallDir....... $(BASEINSTALLDIR)'#010+ - ' @$(ECHO) BinInstallDir........ $','(BININSTALLDIR)'#010+ + ' @$(ECHO) BinInstallDir........ $(BININSTALLDIR)'#010+ ' @$(ECHO) LibInstallDir........ $(LIBINSTALLDIR)'#010+ - ' @$(ECHO) UnitInstallDir....... $(UNITINSTALLDIR)'#010+ + ' @$(ECHO) Un','itInstallDir....... $(UNITINSTALLDIR)'#010+ ' @$(ECHO) SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+ - ' @$(ECHO) DocInstallDir........ $(DOCINST','ALLDIR)'#010+ + ' @$(ECHO) DocInstallDir........ $(DOCINSTALLDIR)'#010+ ' @$(ECHO) DataInstallDir....... $(DATAINSTALLDIR)'#010+ ' @$(ECHO)'#010+ - ' @$(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+ + ' @$','(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+ ' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+ ' @$(ECHO)'#010+ #010+ '[directorytargets]'#010+ - '###############','#####################################################'+ - '#'#010+ - '# Directories'#010+ '#####################################################################'#010+ + '# Directories'#010+ + '########################','############################################'+ + '#'#010+ #010+ '[localmakefile]'#010+ '#####################################################################'#010+ - '# Local Makefi','le'#010+ + '# Local Makefile'#010+ '#####################################################################'#010+ #010+ - 'ifneq ($(wildcard fpcmake.loc),)'#010+ + 'ifneq ($(wildcard f','pcmake.loc),)'#010+ 'include fpcmake.loc'#010+ 'endif'#010+ #010+ '[userrules]'#010+ '#####################################################################'#010+ '# Users rules'#010+ - '##########','##########################################################'+ - '#'#010+ + '#####################################################################'#010+ #010+ #010+ '[end]'#010 diff --git a/utils/fpcmake.ini b/utils/fpcmake.ini index 13d8dad9c9..901ae096ea 100644 --- a/utils/fpcmake.ini +++ b/utils/fpcmake.ini @@ -128,8 +128,10 @@ export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION ifdef FPCDIR override FPCDIR:=$(subst \,/,$(FPCDIR)) ifeq ($(wildcard $(FPCDIR)/rtl),) +ifeq ($(wildcard $(FPCDIR)/units),) override FPCDIR=wrong endif +endif else override FPCDIR=wrong endif @@ -138,9 +140,23 @@ endif # Detect FPCDIR ifeq ($(FPCDIR),wrong) ifdef inlinux +override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION) +ifeq ($(wildcard $(FPCDIR)/units),) override FPCDIR=/usr/lib/fpc/$(FPC_VERSION) +endif else override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH)))))) +override FPCDIR:=$(FPCDIR)/.. +ifeq ($(wildcard $(FPCDIR)/rtl),) +ifeq ($(wildcard $(FPCDIR)/units),) +override FPCDIR:=$(FPCDIR)/.. +ifeq ($(wildcard $(FPCDIR)/rtl),) +ifeq ($(wildcard $(FPCDIR)/units),) +override FPCDIR=wrong +endif +endif +endif +endif endif endif @@ -659,6 +675,7 @@ export OTHERLIBDIR # Redirection ##################################################################### +# Release ? Then force OPT and don't use extra opts via commandline ifndef REDIRFILE REDIRFILE=log endif @@ -745,24 +762,24 @@ endif [command_end] # Smartlinking -ifdef SMARTLINK +ifdef LINKSMART override FPCOPT+=-CX endif +# Smartlinking +ifdef CREATESMART +override FPCOPT+=-XX +endif + # Debug ifdef DEBUG override FPCOPT+=-g -dDEBUG endif # Release mode (strip, optimize and don't load ppc386.cfg) -# 0.99.12b has a bug in the optimizer so don't use it by default ifdef RELEASE -ifeq ($(FPC_VERSION),0.99.12) -override FPCOPT+=-Xs -OGp3 -n -else override FPCOPT+=-Xs -OG2p3 -n endif -endif # Verbose settings (warning,note,info) ifdef VERBOSE @@ -986,7 +1003,7 @@ SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS) endif fpc_smart: - $(MAKE) all SMARTLINK=1 + $(MAKE) all LINKSMART=1 CREATESMART=1 fpc_shared: all ifdef inlinux diff --git a/utils/fpcmake.pp b/utils/fpcmake.pp index becb646e4c..fd40324741 100644 --- a/utils/fpcmake.pp +++ b/utils/fpcmake.pp @@ -965,9 +965,11 @@ begin Add('ifeq ($(FPCDIR),wrong)'); Add('override FPCDIR='+userini.dirfpc); Add('ifeq ($(wildcard $(FPCDIR)/rtl),)'); + Add('ifeq ($(wildcard $(FPCDIR)/units),)'); Add('override FPCDIR=wrong'); Add('endif'); Add('endif'); + Add('endif'); Add(''); end; AddSection(true,'fpcdirdetect'); @@ -1298,7 +1300,11 @@ begin end. { $Log$ - Revision 1.27 2000-01-16 22:26:47 peter + Revision 1.28 2000-01-26 21:16:26 peter + * SMARTLINK=1 split into CREATESMART=1 and LINKSMART=1 + * FPCDIR checks enhanced + + Revision 1.27 2000/01/16 22:26:47 peter * use environment variable again for win32, the file writing gives to much trouble