From 094857811d7e78ea5c209b5419ac9a9a16e2c4db Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Tue, 18 Jan 2000 00:22:29 +0000
Subject: [PATCH] * export FPCEXTCMD which didn't work :(
---
utils/fpcmake.inc | 485 +++++++++++++++++++++++-----------------------
utils/fpcmake.ini | 1 +
2 files changed, 244 insertions(+), 242 deletions(-)
diff --git a/utils/fpcmake.inc b/utils/fpcmake.inc
index ceacb3cb3b..f069cf567b 100644
--- a/utils/fpcmake.inc
+++ b/utils/fpcmake.inc
@@ -1,7 +1,7 @@
{$ifdef Delphi}
-const fpcmakeini : array[0..117] of string[240]=(
+const fpcmakeini : array[0..118] of string[240]=(
{$else Delphi}
-const fpcmakeini : array[0..117,1..240] of char=(
+const fpcmakeini : array[0..118,1..240] of char=(
{$endif Delphi}
';'#010+
'; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
@@ -98,9 +98,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
'endif'#010+
'endif'#010+
+ 'override FPC:=$(subst \,/,$(','FPC))'#010+
#010+
'# Target OS'#010+
- 'ifndef OS_TARGE','T'#010+
+ 'ifndef OS_TARGET'#010+
'OS_TARGET:=$(shell $(FPC) -iTO)'#010+
'endif'#010+
#010+
@@ -115,8 +116,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
#010+
'# Source CPU'#010+
- 'ifndef CPU_SOURCE'#010+
- 'CPU_SOURCE:=$(shell $(FPC) -i','SP)'#010+
+ 'ifndef CPU_SO','URCE'#010+
+ 'CPU_SOURCE:=$(shell $(FPC) -iSP)'#010+
'endif'#010+
#010+
'# FPC version'#010+
@@ -128,16 +129,17 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
#010+
'[fpcdircheckenv]'#010+
- '#####################################################################'#010+
- '# ','FPCDIR Setting'#010+
+ '######################################','##############################'+
+ '#'#010+
+ '# FPCDIR Setting'#010+
'#####################################################################'#010+
#010+
'# Test FPCDIR to look if the RTL dir exists'#010+
'ifdef FPCDIR'#010+
'override FPCDIR:=$(subst \,/,$(FPCDIR))'#010+
- 'ifeq ($(wildcard $(FPCDIR)/rtl),)'#010+
+ 'ifeq ($(wildcard $(FPCD','IR)/rtl),)'#010+
'override FPCDIR=wrong'#010+
- 'e','ndif'#010+
+ 'endif'#010+
'else'#010+
'override FPCDIR=wrong'#010+
'endif'#010+
@@ -148,8 +150,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'ifdef inlinux'#010+
'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+
'else'#010+
- 'override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(firstword $(strip $(wildc'+
- 'ard $(addsuffi','x /$(FPC)$(EXEEXT),$(SEARCHPATH))))))'#010+
+ 'override FPCDIR:=$(subst /$(FPC)$(EXEEXT),,$(first','word $(strip $(wil'+
+ 'dcard $(addsuffix /$(FPC)$(EXEEXT),$(SEARCHPATH))))))'#010+
'endif'#010+
'endif'#010+
#010+
@@ -160,8 +162,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
#010+
'[checkfpcdirsubs]'#010+
- '# Check if the dirs really exists, else turn it off'#010+
- 'ifeq ($(wildcard $(UNI','TSDIR)),)'#010+
+ '# Check if the dirs really exists, else ','turn it off'#010+
+ 'ifeq ($(wildcard $(UNITSDIR)),)'#010+
'UNITSDIR='#010+
'endif'#010+
'ifeq ($(wildcard $(TOOLKITSDIR)),)'#010+
@@ -175,34 +177,34 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
#010+
#010+
- '[presettings]'#010+
- '################################','####################################'+
- '#'#010+
+ '[presettings',']'#010+
+ '#####################################################################'#010+
'# Pre Settings'#010+
'#####################################################################'#010+
#010+
#010+
'[usersettings]'#010+
- '#####################################################################'#010+
- '# User Settings'#010+
- '##############','######################################################'+
+ '##################################################################','##'+
'#'#010+
+ '# User Settings'#010+
+ '#####################################################################'#010+
#010+
#010+
'[postsettings]'#010+
'#####################################################################'#010+
'# Post Settings'#010+
- '#####################################################################'#010+
+ '###############################################','#####################'+
+ '#'#010+
#010+
#010+
- '[shelltoo','ls]'#010+
+ '[shelltools]'#010+
'#####################################################################'#010+
'# Shell tools'#010+
'#####################################################################'#010+
#010+
'# echo'#010+
'ifndef ECHO'#010+
- 'ECHO:=$(strip $(wildcard $(addsuffix /gecho$(EXEEXT),$(SEARCHP','ATH)))'+
+ 'ECHO:=$(strip $(wildcard $(a','ddsuffix /gecho$(EXEEXT),$(SEARCHPATH)))'+
')'#010+
'ifeq ($(ECHO),)'#010+
'ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH))))'#010+
@@ -214,9 +216,9 @@ const fpcmakeini : array[0..117,1..240] of char=(
'ECHOE=$(ECHO) -E'#010+
'endif'#010+
'else'#010+
- 'ECHO:=$(firstword $(ECHO))'#010+
+ 'ECHO:=$(firstw','ord $(ECHO))'#010+
'ECHOE=$(ECHO) -E'#010+
- 'endi','f'#010+
+ 'endif'#010+
'endif'#010+
#010+
'# To copy pograms'#010+
@@ -236,10 +238,10 @@ const fpcmakeini : array[0..117,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 pro','gram'#010+
+ '# Check deltree program'#010+
'ifndef DELTREE'#010+
'DELTREE:=rm -rf'#010+
'endif'#010+
@@ -256,9 +258,9 @@ const fpcmakeini : array[0..117,1..240] of char=(
'# To install programs'#010+
'ifndef INSTALLEXE'#010+
'ifdef inlinux'#010+
- 'INSTALLEXE:=install -m 755'#010+
+ 'IN','STALLEXE:=install -m 755'#010+
'else'#010+
- 'INST','ALLEXE:=$(COPY)'#010+
+ 'INSTALLEXE:=$(COPY)'#010+
'endif'#010+
'endif'#010+
#010+
@@ -271,22 +273,21 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- 'export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MK'+
- 'DIR'#010+
+ 'export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL I','NSTALLEXE '+
+ 'MKDIR'#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+
- '# linker, but pro','bably not used'#010+
+ '# linker, but probably not used'#010+
'ifndef LD'#010+
'LD=ld'#010+
'endif'#010+
@@ -303,8 +304,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
#010+
'# also call ppas if with command option -s'#010+
- 'ifeq (,$(findstring -s ,$(COMPILER)))'#010+
- 'EXECPPAS='#010,
+ 'ifeq (,$(finds','tring -s ,$(COMPILER)))'#010+
+ 'EXECPPAS='#010+
'else'#010+
'EXECPPAS:=@$(PPAS)'#010+
'endif'#010+
@@ -319,10 +320,10 @@ const fpcmakeini : array[0..117,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+
- 'P','PDEP='#010+
+ 'PPDEP='#010+
'else'#010+
'PPDEP:=$(firstword $(PPDEP))'#010+
'endif'#010+
@@ -335,9 +336,9 @@ const fpcmakeini : array[0..117,1..240] of char=(
'PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(EXEEXT),$(SEARCHPATH'+
'))))'#010+
'ifeq ($(PPUMOVE),)'#010+
- 'PPUMOVE='#010+
+ 'PPUMOV','E='#010+
'else'#010+
- 'PPUMOVE:=$(firstword $(PPU','MOVE))'#010+
+ 'PPUMOVE:=$(firstword $(PPUMOVE))'#010+
'endif'#010+
'endif'#010+
'export PPUMOVE'#010+
@@ -350,10 +351,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'ifeq ($(PPUFILES),)'#010+
'PPUFILES='#010+
'else'#010+
- 'PPUFILES:=$(firstword $(PPUFILES))'#010+
+ 'PPUFILES:=$(firs','tword $(PPUFILES))'#010+
'endif'#010+
'endif'#010+
- 'exp','ort PPUFILES'#010+
+ 'export PPUFILES'#010+
#010+
'[tool_data2inc]'#010+
'# data2inc'#010+
@@ -364,11 +365,11 @@ const fpcmakeini : array[0..117,1..240] of char=(
'DATA2INC='#010+
'else'#010+
'DATA2INC:=$(firstword $(DATA2INC))'#010+
- 'endif'#010+
+ 'en','dif'#010+
'endif'#010+
'export DATA2INC'#010+
#010+
- '[tool_d','iff]'#010+
+ '[tool_diff]'#010+
'# diff'#010+
'ifndef DIFF'#010+
'DIFF:=$(strip $(wildcard $(addsuffix /diff$(EXEEXT),$(SEARCHPATH))))'#010+
@@ -383,7 +384,7 @@ const fpcmakeini : array[0..117,1..240] of char=(
'[tool_cmp]'#010+
'# cmp'#010+
'ifndef CMP'#010+
- 'CMP:=$(strip $(wildcard $(addsuffix /cmp','$(EXEEXT),$(SEARCHPATH))))'#010+
+ 'CMP:=$','(strip $(wildcard $(addsuffix /cmp$(EXEEXT),$(SEARCHPATH))))'#010+
'ifeq ($(CMP),)'#010+
'CMP='#010+
'else'#010+
@@ -396,10 +397,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'# Sed'#010+
'ifndef SED'#010+
'SED:=$(strip $(wildcard $(addsuffix /sed$(EXEEXT),$(SEARCHPATH))))'#010+
- 'ifeq ($(SED),)'#010+
+ 'ifeq ($(SE','D),)'#010+
'SED='#010+
'else'#010+
- 'SED:=$(firstword $(','SED))'#010+
+ 'SED:=$(firstword $(SED))'#010+
'endif'#010+
'endif'#010+
'export SED'#010+
@@ -412,8 +413,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'ifeq ($(OS_TARGET),go32v2)'#010+
'UPXPROG:=1'#010+
'endif'#010+
- 'ifeq ($(OS_TARGET),win32)'#010+
- 'UPXPROG:=1',#010+
+ 'if','eq ($(OS_TARGET),win32)'#010+
+ 'UPXPROG:=1'#010+
'endif'#010+
'ifdef UPXPROG'#010+
'UPXPROG:=$(strip $(wildcard $(addsuffix /upx$(EXEEXT),$(SEARCHPATH))))'+
@@ -428,20 +429,20 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
'endif'#010+
'export UPXPROG'#010+
- #010+
+ #010,
'[tool_date]'#010+
'# gdate/date'#010+
- 'ifndef DA','TE'#010+
+ 'ifndef DATE'#010+
'DATE:=$(strip $(wildcard $(addsuffix /date$(EXEEXT),$(SEARCHPATH))))'#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 $(DA','TE))'#010+
'endif'#010+
'else'#010+
- 'DATE:=$(firstword ','$(DATE))'#010+
+ 'DATE:=$(firstword $(DATE))'#010+
'endif'#010+
'endif'#010+
'export DATE'#010+
@@ -455,7 +456,7 @@ const fpcmakeini : array[0..117,1..240] of char=(
'[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),$(SEARCHP','ATH))'+
+ 'ZIPPROG:=$(strip $(wildcard $','(addsuffix /zip$(EXEEXT),$(SEARCHPATH))'+
'))'#010+
'ifeq ($(ZIPPROG),)'#010+
'ZIPPROG='#010+
@@ -471,9 +472,9 @@ const fpcmakeini : array[0..117,1..240] of char=(
'[tool_tar]'#010+
'# Tar'#010+
'ifndef TARPROG'#010+
- 'TARPROG:=$(strip $(wildcard $(addsuffix /tar$(EXEEXT),$(SEARCHPATH))))'+
- #010+
- 'ifeq ','($(TARPROG),)'#010+
+ 'TARPROG:=$(strip $(wildcard $(addsuffix /t','ar$(EXEEXT),$(SEARCHPATH))'+
+ '))'#010+
+ 'ifeq ($(TARPROG),)'#010+
'TARPROG='#010+
'else'#010+
'TARPROG:=$(firstword $(TARPROG))'#010+
@@ -491,7 +492,7 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
#010+
'[extensions]'#010+
- '#####################################################','###############'+
+ '###################','#################################################'+
'#'#010+
'# Default extensions'#010+
'#####################################################################'#010+
@@ -501,10 +502,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'PPLEXT=.ppl'#010+
'PPUEXT=.ppu'#010+
'OEXT=.o'#010+
- 'ASMEXT=.s'#010+
+ 'ASMEXT=.','s'#010+
'SMARTEXT=.sl'#010+
'STATICLIBEXT=.a'#010+
- 'SHA','REDLIBEXT=.so'#010+
+ 'SHAREDLIBEXT=.so'#010+
'RSTEXT=.rst'#010+
'FPCMADE=fpcmade'#010+
#010+
@@ -520,8 +521,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
#010+
'# Go32v2'#010+
- 'ifeq ($(OS_TARGET),go32v2)'#010+
- 'FPCMADE=fpcmade.do','s'#010+
+ 'ifeq ($(OS_','TARGET),go32v2)'#010+
+ 'FPCMADE=fpcmade.dos'#010+
'endif'#010+
#010+
'# Linux'#010+
@@ -538,10 +539,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'STATICLIBEXT=.aw'#010+
'SHAREDLIBEXT=.dll'#010+
'FPCMADE=fpcmade.w32'#010+
- 'endif'#010+
+ 'e','ndif'#010+
#010+
'# OS/2'#010+
- 'ifeq ($(OS_TARGET),os','2)'#010+
+ 'ifeq ($(OS_TARGET),os2)'#010+
'PPUEXT=.ppo'#010+
'ASMEXT=.so2'#010+
'OEXT=.oo2'#010+
@@ -556,19 +557,19 @@ const fpcmakeini : array[0..117,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+
- '# deter','mine which .pas extension is used'#010+
+ '# determine which .pas extension is used'#010+
'ifndef PASEXT'#010+
'ifdef EXEOBJECTS'#010+
'override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(EX'+
'EOBJECTS)))))'#010+
'else'#010+
- 'override TESTPAS:=$(strip $(wildcard $(addsuffix .pas,$(firstword $(UN'+
- 'ITOBJECTS)))))'#010+
- 'e','ndif'#010+
+ 'override TESTPAS:=$(strip $(wildcard $(addsuffix .pa','s,$(firstword $('+
+ 'UNITOBJECTS)))))'#010+
+ 'endif'#010+
'ifeq ($(TESTPAS),)'#010+
'PASEXT=.pp'#010+
'else'#010+
@@ -580,8 +581,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'[dir_default]'#010+
'#####################################################################'#010+
'# Default Directories'#010+
- '####################################################################','#'+
- #010+
+ '##################################','##################################'+
+ '#'#010+
#010+
'# set the prefix directory where to install everything'#010+
'ifndef PREFIXINSTALLDIR'#010+
@@ -593,8 +594,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
'export PREFIXINSTALLDIR'#010+
#010+
- '# Where to place the resulting zip files'#010+
- 'ifndef DESTZIPDIR'#010,
+ '# Where to place the resu','lting zip files'#010+
+ 'ifndef DESTZIPDIR'#010+
'DESTZIPDIR:=$(BASEDIR)'#010+
'endif'#010+
'export DESTZIPDIR'#010+
@@ -603,9 +604,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'[dir_install]'#010+
'#####################################################################'#010+
'# Install Directories'#010+
- '#####################################################################'#010+
+ '###################################################','#################'+
+ '#'#010+
#010+
- '# set the base',' directory where to install everything'#010+
+ '# set the base directory where to install everything'#010+
'ifndef BASEINSTALLDIR'#010+
'ifdef inlinux'#010+
'BASEINSTALLDIR=$(PREFIXINSTALLDIR)/lib/fpc/$(FPC_VERSION)'#010+
@@ -614,8 +616,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- '# set the directory where to install the binaries'#010+
- 'ifnd','ef BININSTALLDIR'#010+
+ '# set the directory ','where to install the binaries'#010+
+ 'ifndef BININSTALLDIR'#010+
'ifdef inlinux'#010+
'BININSTALLDIR=$(PREFIXINSTALLDIR)/bin'#010+
'else'#010+
@@ -624,8 +626,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
#010+
'# set the directory where to install the units.'#010+
- 'ifndef UNITINSTALLDIR'#010+
- 'UNITINSTALLDIR=$(BASEINSTALLDIR)/u','nits/$(OS_TARGET)'#010+
+ 'ifndef UNITINSTALLDIR'#010,
+ 'UNITINSTALLDIR=$(BASEINSTALLDIR)/units/$(OS_TARGET)'#010+
'ifdef UNITSUBDIR'#010+
'UNITINSTALLDIR:=$(UNITINSTALLDIR)/$(UNITSUBDIR)'#010+
'endif'#010+
@@ -635,8 +637,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
'ifndef LIBINSTALLDIR'#010+
'ifdef inlinux'#010+
'LIBINSTALLDIR=$(PREFIXINSTALLDIR)/lib'#010+
- 'else'#010+
- 'LIBINSTALLDIR=$(UNITINSTALLDIR',')'#010+
+ 'e','lse'#010+
+ 'LIBINSTALLDIR=$(UNITINSTALLDIR)'#010+
'endif'#010+
'endif'#010+
#010+
@@ -646,9 +648,9 @@ const fpcmakeini : array[0..117,1..240] of char=(
'SOURCEINSTALLDIR=$(PREFIXINSTALLDIR)/src/fpc-$(FPC_VERSION)'#010+
'else'#010+
'SOURCEINSTALLDIR=$(BASEINSTALLDIR)/source'#010+
- 'endif'#010+
+ 'endif'#010,
'ifdef SOURCESUBDIR'#010+
- 'SOURCEINSTALLDI','R:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)'#010+
+ 'SOURCEINSTALLDIR:=$(SOURCEINSTALLDIR)/$(SOURCESUBDIR)'#010+
'endif'#010+
'endif'#010+
#010+
@@ -657,11 +659,11 @@ const fpcmakeini : array[0..117,1..240] of char=(
'ifdef inlinux'#010+
'DOCINSTALLDIR=$(PREFIXINSTALLDIR)/doc/fpc-$(FPC_VERSION)'#010+
'else'#010+
- 'DOCINSTALLDIR=$(BASEINSTALLDIR)/doc'#010+
+ 'DOCINSTALLDIR=$(BASE','INSTALLDIR)/doc'#010+
'endif'#010+
'endif'#010+
#010+
- '# Whe','re the some extra (data)files will be stored'#010+
+ '# Where the some extra (data)files will be stored'#010+
'ifndef DATAINSTALLDIR'#010+
'DATAINSTALLDIR=$(BASEINSTALLDIR)'#010+
'endif'#010+
@@ -671,7 +673,7 @@ const fpcmakeini : array[0..117,1..240] of char=(
'# On linux, try to find where libgcc.a is.'#010+
'ifdef inlinux'#010+
'ifndef GCCLIBDIR'#010+
- 'GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| he','ad -n 1| awk '#039'{ pri'+
+ 'GCCLIBDIR:=','$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '#039'{ pri'+
'nt $$4 } '#039'`)'#010+
'endif'#010+
'endif'#010+
@@ -682,11 +684,11 @@ const fpcmakeini : array[0..117,1..240] of char=(
'# 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+
- 'exp','ort OTHERLIBDIR'#010+
+ 'export OTHERLIBDIR'#010+
#010+
#010+
'[redir]'#010+
@@ -694,7 +696,7 @@ const fpcmakeini : array[0..117,1..240] of char=(
'# Redirection'#010+
'#####################################################################'#010+
#010+
- '# Release ? Then force OPT and don'#039't use extra opts via com','mandl'+
+ '# Release ? Then force OP','T and don'#039't use extra opts via commandl'+
'ine'#010+
'ifndef REDIRFILE'#010+
'REDIRFILE=log'#010+
@@ -709,16 +711,15 @@ const fpcmakeini : array[0..117,1..240] of char=(
'override REDIR:= >> $(REDIRFILE)'#010+
'endif'#010+
#010+
- '[command_begin]'#010+
- '##########################','##########################################'+
- '#'#010+
+ '[command','_begin]'#010+
+ '#####################################################################'#010+
'# Compiler Command Line'#010+
'#####################################################################'#010+
#010+
'# Load commandline OPTDEF and add FPC_CPU define'#010+
- 'override FPCOPTDEF:=-d$(CPU_TARGET)'#010+
+ 'override FPCOPTDEF',':=-d$(CPU_TARGET)'#010+
#010+
- '# Load commandl','ine OPT and add target and unit dir to be sure'#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+
'endif'#010+
@@ -729,9 +730,9 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
#010+
#010+
- '[command_needunit]'#010+
+ '[command_needunit]',#010+
'ifdef NEEDUNITDIR'#010+
- 'override FPCOPT','+=$(addprefix -Fu,$(NEEDUNITDIR))'#010+
+ 'override FPCOPT+=$(addprefix -Fu,$(NEEDUNITDIR))'#010+
'endif'#010+
#010+
#010+
@@ -745,10 +746,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'ifdef NEEDLIBDIR'#010+
'override FPCOPT+=$(addprefix -Fl,$(NEEDLIBDIR))'#010+
'endif'#010+
- #010+
+ #010,
#010+
'[command_needobj]'#010+
- 'ifdef NEEDOBJDI','R'#010+
+ 'ifdef NEEDOBJDIR'#010+
'override FPCOPT+=$(addprefix -Fo,$(NEEDOBJDIR))'#010+
'endif'#010+
#010+
@@ -760,8 +761,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
'[command_gcclib]'#010+
'# Add GCC lib path if asked'#010+
- 'ifdef GCCLIBDIR'#010+
- 'override FPCOPT+=-Fl$(GCCLIBDIR',')'#010+
+ 'ifdef GCCLIBD','IR'#010+
+ 'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
'endif'#010+
#010+
'[command_otherlib]'#010+
@@ -773,10 +774,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'[command_target]'#010+
'# Target dirs'#010+
'ifdef TARGETDIR'#010+
- 'override FPCOPT+=-FE$(TARGETDIR)'#010+
+ 'override FPCOPT+=-FE$(TARG','ETDIR)'#010+
'endif'#010+
#010+
- '[command_unittarget]',#010+
+ '[command_unittarget]'#010+
'ifdef UNITTARGETDIR'#010+
'override FPCOPT+=-FU$(UNITTARGETDIR)'#010+
'endif'#010+
@@ -792,7 +793,7 @@ const fpcmakeini : array[0..117,1..240] of char=(
'override FPCOPT+=-g -dDEBUG'#010+
'endif'#010+
#010+
- '# Release mode (strip, optimize and don'#039't load ','ppc386.cfg)'#010+
+ '# Release mod','e (strip, optimize and don'#039't load ppc386.cfg)'#010+
'ifdef RELEASE'#010+
'override FPCOPT+=-Xs -OG2p3 -n'#010+
'endif'#010+
@@ -804,10 +805,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
'# Add commandline options'#010+
'ifdef OPT'#010+
- 'override FPCOPT+=$(OPT)'#010+
+ 'override FPCOPT+=$(OPT)',#010+
'endif'#010+
'ifdef UNITDIR'#010+
- 'override FPCO','PT+=$(addprefix -Fu,$(UNITDIR))'#010+
+ 'override FPCOPT+=$(addprefix -Fu,$(UNITDIR))'#010+
'endif'#010+
'ifdef LIBDIR'#010+
'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
@@ -816,10 +817,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
'override FPCOPT+=$(addprefix -Fo,$(OBJDIR))'#010+
'endif'#010+
'ifdef INCDIR'#010+
- 'override FPCOPT+=$(addprefix -Fi,$(INCDIR))'#010+
+ 'override FPCOPT+=$(addprefix ','-Fi,$(INCDIR))'#010+
'endif'#010+
#010+
- '# Add define','s from FPCOPTDEF to FPCOPT'#010+
+ '# Add defines from FPCOPTDEF to FPCOPT'#010+
'ifdef FPCOPTDEF'#010+
'override FPCOPT+=$(FPCOPTDEF)'#010+
'endif'#010+
@@ -831,27 +832,28 @@ const fpcmakeini : array[0..117,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+
#010+
- '[comma','nd_win32file]'#010+
+ '[command_win32file]'#010+
'# For win32 the options are passed using the file fpcext.cmd'#010+
- 'ifndef FPCEXTCMD'#010+
- 'FPCEXTCMD=fpcext.cmd'#010+
+ 'ifndef FPCEXTFILE'#010+
+ 'FPCEXTFILE=fpcext.cmd'#010+
'endif'#010+
'ifeq ($(OS_SOURCE),win32)'#010+
- 'override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)")'#010+
- 'override TMPVAR:=$(foreach A,$(FPCOPT),$(shell ','"$(ECHOE) "$(A)" >> $'+
- '(FPCEXTCMD)"))'#010+
- 'override FPCOPT:=@$(FPCEXTCMD)'#010+
+ 'override TMPVAR:=$(shell "$(DEL) $(FPCEXTFILE)")'#010+
+ 'override T','MPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHOE) "$(A)" >> $'+
+ '(FPCEXTFILE)"))'#010+
+ 'override FPCOPT:=@$(FPCEXTFILE)'#010+
'endif'#010+
#010+
'[command_win32env]'#010+
'# For win32 the options are passed using the environment FPCEXTCMD'#010+
'ifeq ($(OS_SOURCE),win32)'#010+
- 'override FPCEXTCMD:=$(FPCOPT)'#010+
- 'override FPCOPT:=!FPCEXT','CMD'#010+
+ 'override FPCEXT','CMD:=$(FPCOPT)'#010+
+ 'override FPCOPT:=!FPCEXTCMD'#010+
+ 'export FPCEXTCMD'#010+
'endif'#010+
#010+
'[command_compiler]'#010+
@@ -861,37 +863,36 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
'[standardrules]'#010+
'#####################################################################'#010+
- '# Standard rules'#010+
- '##############################################','######################'+
- '#'#010+
+ '# Stand','ard rules'#010+
+ '#####################################################################'#010+
#010+
'[packagedependrules]'#010+
'#####################################################################'#010+
'# Package depends'#010+
- '#####################################################################'#010+
+ '##################################################','##################'+
+ '#'#010+
#010+
#010+
'[loaderrules]'#010+
- '####################','################################################'+
- '#'#010+
+ '#####################################################################'#010+
'# Loaders'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_loaders'#010+
#010+
'%$(OEXT): %$(LOADEREXT)'#010+
- ' $(AS) -o $*$(OEXT) $<'#010+
+ ' ','$(AS) -o $*$(OEXT) $<'#010+
#010+
'override ALLTARGET+=fpc_loaders'#010+
- 'o','verride CLEANTARGET+=fpc_loaders_clean'#010+
+ 'override CLEANTARGET+=fpc_loaders_clean'#010+
'override SHOWINSTALLTARGET+=fpc_loaders_showinstall'#010+
'override INSTALLTARGET+=fpc_loaders_install'#010+
#010+
- 'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOADEROBJECTS))'#010+
+ 'override LOADEROFILES:=$(addsuffix $(OEXT),$(LOA','DEROBJECTS))'#010+
#010+
'fpc_loaders: $(LOADEROFILES)'#010+
#010+
- 'fpc_loaders_','clean:'#010+
+ 'fpc_loaders_clean:'#010+
' -$(DEL) $(LOADEROFILES)'#010+
#010+
'fpc_loaders_showinstall:'#010+
@@ -899,8 +900,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
')'#010+
#010+
'fpc_loaders_install:'#010+
- ' $(MKDIR) $(UNITINSTALLDIR)'#010+
- ' $(INSTALL) $(LOADEROFILES) $(UNITINSTA','LLDIR)'#010+
+ ' $(MKDIR) $(UNITIN','STALLDIR)'#010+
+ ' $(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)'#010+
#010+
#010+
'[unitrules]'#010+
@@ -908,11 +909,11 @@ const fpcmakeini : array[0..117,1..240] of char=(
'# Units'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fpc_units'#010+
+ '.PHONY: fpc_un','its'#010+
#010+
'override ALLTARGET+=fpc_units'#010+
#010+
- 'override UNITPPUFILE','S=$(addsuffix $(PPUEXT),$(UNITOBJECTS))'#010+
+ 'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))'#010+
'override INSTALLPPUFILES+=$(UNITPPUFILES)'#010+
'override CLEANPPUFILES+=$(UNITPPUFILES)'#010+
#010+
@@ -921,17 +922,18 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
#010+
'[exerules]'#010+
- '#####################################################################'#010+
- '# Exes',#010+
+ '####################','################################################'+
+ '#'#010+
+ '# Exes'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_exes'#010+
#010+
'override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))'#010+
- 'override EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))'#010+
+ 'override EXEOFILES=$(addsuffix $(OEXT),','$(EXEOBJECTS))'#010+
#010+
'override ALLTARGET+=fpc_exes'#010+
- 'override IN','STALLEXEFILES+=$(EXEFILES)'#010+
+ 'override INSTALLEXEFILES+=$(EXEFILES)'#010+
'override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)'#010+
#010+
'fpc_exes: $(EXEFILES)'#010+
@@ -939,9 +941,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
'[rstrules]'#010+
'#####################################################################'#010+
- '# Resource strings'#010+
- '#######################################','#############################'+
- '#'#010+
+ '# ','Resource strings'#010+
+ '#####################################################################'#010+
#010+
'override RSTFILES=$(addsuffix $(RSTEXT),$(RSTOBJECTS))'#010+
#010+
@@ -949,17 +950,17 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
#010+
'[examplerules]'#010+
- '#####################################################################'#010+
- '# Examples'#010+
- '##################','##################################################'+
+ '###########################################','#########################'+
'#'#010+
+ '# Examples'#010+
+ '#####################################################################'#010+
#010+
'.PHONY: fpc_examples fpc_test'#010+
#010+
'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))'#010+
- 'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS))'#010+
+ 'override EXAMPLEOFILES:=$(addsuffix ','$(OEXT),$(EXAMPLEOBJECTS))'#010+
#010+
- 'override CLEANEXEFILES+=$(EX','AMPLEFILES) $(EXAMPLEOFILES)'#010+
+ 'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
#010+
'fpc_examples: all $(EXAMPLEFILES)'#010+
#010+
@@ -968,9 +969,8 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
'[compilerules]'#010+
'#####################################################################'#010+
- '# General compile rules'#010+
- '#############################################','#######################'+
- '#'#010+
+ '# General com','pile rules'#010+
+ '#####################################################################'#010+
#010+
'.PHONY: fpc_packages fpc_all fpc_debug'#010+
#010+
@@ -979,12 +979,12 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
'fpc_packages: $(COMPILEPACKAGES)'#010+
#010+
- 'fpc_all: fpc_packages $(FPCMADE)'#010+
+ 'fpc_all: fpc_packag','es $(FPCMADE)'#010+
#010+
'fpc_debug:'#010+
' $(MAKE) all DEBUG=1'#010+
#010+
- '#',' General compile rules, available for both possible PASEXT'#010+
+ '# General compile rules, available for both possible PASEXT'#010+
#010+
'.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp'#010+
#010+
@@ -992,9 +992,9 @@ const fpcmakeini : array[0..117,1..240] of char=(
' $(COMPILER) $< $(REDIR)'#010+
' $(EXECPASS)'#010+
#010+
- '%$(PPUEXT): %.pas'#010+
+ '%$(PP','UEXT): %.pas'#010+
' $(COMPILER) $< $(REDIR)'#010+
- ' $(E','XECPASS)'#010+
+ ' $(EXECPASS)'#010+
#010+
'%$(EXEEXT): %.pp'#010+
' $(COMPILER) $< $(REDIR)'#010+
@@ -1006,19 +1006,20 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
#010+
'[libraryrules]'#010+
- '#####################################################################'#010+
- '# L','ibrary'#010+
+ '#################','###################################################'+
+ '#'#010+
+ '# Library'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_smart fpc_shared'#010+
#010+
'# Default sharedlib units are all unit objects'#010+
'ifndef SHAREDLIBUNITOBJECTS'#010+
- 'SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+
+ 'S','HAREDLIBUNITOBJECTS:=$(UNITOBJECTS)'#010+
'endif'#010+
#010+
'fpc_smart:'#010+
- ' ',' $(MAKE) all SMARTLINK=1'#010+
+ ' $(MAKE) all SMARTLINK=1'#010+
#010+
'fpc_shared: all'#010+
'ifdef inlinux'#010+
@@ -1028,27 +1029,26 @@ const fpcmakeini : array[0..117,1..240] of char=(
' $(PPUMOVE) $(SHAREDLIBUNITOBJECTS) -o$(LIBNAME)'#010+
'endif'#010+
'else'#010+
- ' @$(ECHO) "Shared Libraries not supported"'#010+
+ ' ',' @$(ECHO) "Shared Libraries not supported"'#010+
'endif'#010+
- #010,
+ #010+
#010+
'[installrules]'#010+
'#####################################################################'#010+
'# Install rules'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fpc_showinstall fpc_install'#010+
+ '.PHONY: fpc','_showinstall fpc_install'#010+
#010+
'ifdef EXTRAINSTALLUNITS'#010+
- 'overri','de INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS)'+
- ')'#010+
+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS))'#010+
'endif'#010+
#010+
'ifdef INSTALLPPUFILES'#010+
'ifdef PPUFILES'#010+
'ifdef inlinux'#010+
- 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))'#010+
- 'INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTAL','LPPUFILES))'#010+
+ 'INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFIL','ES))'#010+
+ 'INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))'#010+
'else'#010+
'INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))'#010+
'endif'#010+
@@ -1058,51 +1058,51 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- 'fpc_showinstall: $(SHOWINSTALLTARGET)'#010+
- 'ifdef INSTALLEXEFILES',#010+
+ 'fpc','_showinstall: $(SHOWINSTALLTARGET)'#010+
+ 'ifdef INSTALLEXEFILES'#010+
' @$(ECHO) -e $(addprefix "\n"$(BININSTALLDIR)/,$(INSTALLEXEFILE'+
'S))'#010+
'endif'#010+
'ifdef INSTALLPPUFILES'#010+
' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUFIL'+
'ES))'#010+
- 'ifneq ($(INSTALLPPULINKFILES),)'#010+
- ' @$(ECHO) -e $(addprefi','x "\n"$(UNITINSTALLDIR)/,$(INSTALLPPUL'+
- 'INKFILES))'#010+
+ 'ifneq ','($(INSTALLPPULINKFILES),)'#010+
+ ' @$(ECHO) -e $(addprefix "\n"$(UNITINSTALLDIR)/,$(INSTALLPPULIN'+
+ 'KFILES))'#010+
'endif'#010+
'ifneq ($(INSTALLPPULIBFILES),)'#010+
' @$(ECHO) -e $(addprefix "\n"$(LIBINSTALLDIR)/,$(INSTALLPPULIBF'+
'ILES))'#010+
'endif'#010+
'endif'#010+
- 'ifdef EXTRAINSTALLFILES'#010+
- ' @$(ECHO) -e $(addprefix "\n"$(DAT','AINSTALLDIR)/,$(EXTRAINSTAL'+
- 'LFILES))'#010+
+ 'ifdef EXT','RAINSTALLFILES'#010+
+ ' @$(ECHO) -e $(addprefix "\n"$(DATAINSTALLDIR)/,$(EXTRAINSTALLF'+
+ 'ILES))'#010+
'endif'#010+
#010+
'fpc_install: $(INSTALLTARGET)'#010+
'# Create UnitInstallFiles'#010+
'ifdef INSTALLEXEFILES'#010+
' $(MKDIR) $(BININSTALLDIR)'#010+
- '# Compress the exes if upx is defined'#010+
+ '# Compress the exes if upx is',' defined'#010+
'ifdef UPXPROG'#010+
- ' -$(UPXPROG) $(INSTALLEXEF','ILES)'#010+
+ ' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
'endif'#010+
' $(INSTALLEXE) $(INSTALLEXEFILES) $(BININSTALLDIR)'#010+
'endif'#010+
'ifdef INSTALLPPUFILES'#010+
' $(MKDIR) $(UNITINSTALLDIR)'#010+
- ' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALLDIR)'#010+
+ ' $(INSTALL) $(INSTALLPPUFILES) $(UNITINSTALL','DIR)'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+
- ' $(INSTALL) ','$(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
+ ' $(INSTALL) $(INSTALLPPULINKFILES) $(UNITINSTALLDIR)'#010+
'endif'#010+
'ifneq ($(INSTALLPPULIBFILES),)'#010+
' $(MKDIR) $(LIBINSTALLDIR)'#010+
' $(INSTALL) $(INSTALLPPULIBFILES) $(LIBINSTALLDIR)'#010+
'endif'#010+
'endif'#010+
- 'ifdef EXTRAINSTALLFILES'#010+
- ' $(MKDIR) $(DATAINSTALLDIR)',#010+
+ 'if','def EXTRAINSTALLFILES'#010+
+ ' $(MKDIR) $(DATAINSTALLDIR)'#010+
' $(INSTALL) $(EXTRAINSTALLFILES) $(DATAINSTALLDIR)'#010+
'endif'#010+
#010+
@@ -1110,7 +1110,7 @@ const fpcmakeini : array[0..117,1..240] of char=(
'[sourceinstallrules]'#010+
'#####################################################################'#010+
'# SourceInstall rules'#010+
- '############################################################','########'+
+ '####','################################################################'+
'#'#010+
#010+
'.PHONY: fpc_sourceinstall'#010+
@@ -1121,21 +1121,20 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
'fpc_sourceinstall: clean'#010+
' $(MKDIR) $(SOURCEINSTALLDIR)'#010+
- ' $(COPYTREE) $(SOURCETOPDIR) $(SOURCEINSTALLDIR)'#010+
+ ' $(COPYTREE) $(SOURCETOPDI','R) $(SOURCEINSTALLDIR)'#010+
#010+
#010+
'[zipinstallrules]'#010+
- '#############','#######################################################'+
- '#'#010+
+ '#####################################################################'#010+
'# Zip'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_zipinstall'#010+
#010+
'# Create suffix to add'#010+
- 'ifndef PACKAGESUFFIX'#010+
+ 'ifn','def PACKAGESUFFIX'#010+
'PACKAGESUFFIX=$(OS_TARGET)'#010+
- 'ifeq ($(OS_','TARGET),go32v2)'#010+
+ 'ifeq ($(OS_TARGET),go32v2)'#010+
'PACKAGESUFFIX=go32'#010+
'endif'#010+
'ifeq ($(OS_TARGET),win32)'#010+
@@ -1146,13 +1145,13 @@ const fpcmakeini : array[0..117,1..240] of char=(
'# Temporary path to pack a file'#010+
'ifndef PACKDIR'#010+
'ifndef inlinux'#010+
- 'PACKDIR=$(BASEDIR)/pack_tmp'#010+
+ 'PACKDIR=$(BASEDIR)/pack_','tmp'#010+
'else'#010+
'PACKDIR=/tmp/fpc-pack'#010+
'endif'#010+
'endif'#010+
#010+
- '# Maybe crea','te default zipname from packagename'#010+
+ '# Maybe create default zipname from packagename'#010+
'ifndef ZIPNAME'#010+
'ifdef PACKAGENAME'#010+
'ZIPNAME=$(PACKAGEPREFIX)$(PACKAGENAME)$(PACKAGESUFFIX)'#010+
@@ -1160,28 +1159,28 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
#010+
'# Use tar by default under linux'#010+
- 'ifndef USEZIP'#010+
+ 'ifndef USEZIP'#010,
'ifdef inlinux'#010+
'USETAR=1'#010+
'endif'#010+
'endif'#010+
#010+
'fpc_zipinstall:'#010+
- 'ifnd','ef ZIPNAME'#010+
+ 'ifndef ZIPNAME'#010+
' @$(ECHO) "Please specify ZIPNAME!"'#010+
' @exit 1'#010+
'else'#010+
' $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)'#010+
'ifdef USETAR'#010+
- ' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)'#010+
- ' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) ','--file $(DESTZIPDIR)/$'+
- '(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
+ ' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)','$(TAREXT)'#010+
+ ' cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(Z'+
+ 'IPNAME)$(TAREXT) * ; cd $(BASEDIR)'#010+
'else'#010+
' $(DEL) $(DESTZIPDIR)/$(ZIPNAME)/$(ZIPEXT)'#010+
- ' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA'+
+ ' cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNA',
'ME)$(ZIPEXT) * ; cd $(BASEDIR)'#010+
'endif'#010+
- ' $(DELTREE) ','$(PACKDIR)'#010+
+ ' $(DELTREE) $(PACKDIR)'#010+
'endif'#010+
#010+
#010+
@@ -1193,19 +1192,18 @@ const fpcmakeini : array[0..117,1..240] of char=(
'rc'#010+
#010+
#010+
- '[cleanrules]'#010+
- '########################################################','############'+
- '#'#010+
+ '[cleanrules]'#010,
+ '#####################################################################'#010+
'# Clean rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_clean fpc_cleanall'#010+
#010+
'ifdef EXTRACLEANUNITS'#010+
- 'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
+ 'override CLEANPPUFILES+=$(addsu','ffix $(PPUEXT),$(EXTRACLEANUNITS))'#010+
'endif'#010+
#010+
- 'ifdef CLEANPPU','FILES'#010+
+ 'ifdef CLEANPPUFILES'#010+
'ifdef PPUFILES'#010+
'CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))'#010+
'else'#010+
@@ -1214,9 +1212,9 @@ const fpcmakeini : array[0..117,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
- 'fpc_clean: $(CLEANTARGET)'#010+
+ 'fpc_clean: $(','CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
- ' -$(DEL) $(CLEAN','EXEFILES)'#010+
+ ' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
'ifdef CLEANPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+
@@ -1225,26 +1223,28 @@ const fpcmakeini : array[0..117,1..240] of char=(
' -$(DEL) $(CLEANPPULINKFILES)'#010+
'endif'#010+
'ifdef CLEANRSTFILES'#010+
- ' -$(DEL) $(CLEANRSTFILES)'#010+
+ ' -$(DEL) ','$(CLEANRSTFILES)'#010+
'endif'#010+
'ifdef EXTRACLEANFILES'#010+
- ' -$(','DEL) $(EXTRACLEANFILES)'#010+
+ ' -$(DEL) $(EXTRACLEANFILES)'#010+
'endif'#010+
- ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE)'#010+
+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
+ #010+
#010+
'fpc_cleanall: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
- ' -$(DEL) $(CLEANEXEFILES)'#010+
+ ' -$(DEL) $(CLEANEXEFILES)'#010,
'endif'#010+
- ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(A','SMEXT) *$(STATICL'+
- 'IBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
+ ' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
+ 'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
' -$(DELTREE) *$(SMARTEXT)'#010+
- ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE)'#010+
+ ' -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE)'+
+ #010+
#010+
#010+
'[dependrules]'#010+
- '#####################################################################',
- #010+
+ '###########','#########################################################'+
+ '#'#010+
'# Depend rules'#010+
'#####################################################################'#010+
#010+
@@ -1255,26 +1255,27 @@ const fpcmakeini : array[0..117,1..240] of char=(
#010+
#010+
'[inforules]'#010+
- '#####################################################################'#010+
- '# Inf','o rules'#010+
+ '#################','###################################################'+
+ '#'#010+
+ '# Info rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_info fpc_cfginfo fpc_objectinfo fpc_toolsinfo fpc_installi'+
'nfo \'#010+
' fpc_dirinfo'#010+
#010+
- 'fpc_info: $(INFOTARGET)'#010+
+ 'fpc_in','fo: $(INFOTARGET)'#010+
#010+
'[info_cfg]'#010+
'fpc_infocfg:'#010+
- ' @$(ECHO',')'#010+
+ ' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) FPC....... $(FPC)'#010+
' @$(ECHO) Version... $(FPC_VERSION)'#010+
- ' @$(ECHO) CPU....... $(CPU_TARGET)'#010+
+ ' @$(ECHO) CPU....... $(CPU_TARGE','T)'#010+
' @$(ECHO) Source.... $(OS_SOURCE)'#010+
- ' @$(EC','HO) Target.... $(OS_TARGET)'#010+
+ ' @$(ECHO) Target.... $(OS_TARGET)'#010+
' @$(ECHO)'#010+
#010+
'[info_dirs]'#010+
@@ -1284,19 +1285,19 @@ const fpcmakeini : array[0..117,1..240] of char=(
' @$(ECHO) == Directory info =='#010+
' @$(ECHO)'#010+
'ifdef NEEDGCCLIB'#010+
- ' @$(ECHO) GCC library is needed.'#010+
+ ' ',' @$(ECHO) GCC library is needed.'#010+
'endif'#010+
- 'ifdef NEEDOTHERL','IB'#010+
+ 'ifdef NEEDOTHERLIB'#010+
' @$(ECHO) Other library is needed.'#010+
'endif'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
- ' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
+ ' @$(ECHO) O','ther library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+
'endif'#010+
#010+
- '[in','fo_tools]'#010+
+ '[info_tools]'#010+
'fpc_infotools:'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Tools info =='#010+
@@ -1304,10 +1305,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
' @$(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+
+ ' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
'endif'#010+
'ifdef PPUFILES'#010+
' @$(ECHO) PPUFiles.. $(PPUFILES)'#010+
@@ -1316,10 +1317,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
' @$(ECHO) Data2Inc.. $(DATA2INC)'#010+
'endif'#010+
'ifdef SED'#010+
- ' @$(ECHO) Sed....... $(SED)'#010+
+ ' ',' @$(ECHO) Sed....... $(SED)'#010+
'endif'#010+
'ifdef DATE'#010+
- ' @$','(ECHO) Date...... $(DATE)'#010+
+ ' @$(ECHO) Date...... $(DATE)'#010+
'endif'#010+
'ifdef DIFF'#010+
' @$(ECHO) Diff...... $(DIFF)'#010+
@@ -1328,10 +1329,10 @@ const fpcmakeini : array[0..117,1..240] of char=(
' @$(ECHO) Cmp....... $(CMP)'#010+
'endif'#010+
'ifdef UPXPROG'#010+
- ' @$(ECHO) Upx....... $(UPXPROG)'#010+
+ ' @$(ECHO) Upx....... ','$(UPXPROG)'#010+
'endif'#010+
'ifdef ZIPPROG'#010+
- ' @$(ECHO) Zip......','. $(ZIPPROG)'#010+
+ ' @$(ECHO) Zip....... $(ZIPPROG)'#010+
'endif'#010+
' @$(ECHO)'#010+
#010+
@@ -1340,64 +1341,64 @@ const fpcmakeini : array[0..117,1..240] of char=(
' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+
' @$(ECHO)'#010+
- ' @$(ECHO) LoaderObjects..... $(LOADEROBJECTS)'#010+
- ' @$(ECHO) UnitObjects....... $(UNITOBJE','CTS)'#010+
+ ' @$(ECHO) LoaderObjects..... $(LOAD','EROBJECTS)'#010+
+ ' @$(ECHO) UnitObjects....... $(UNITOBJECTS)'#010+
' @$(ECHO) ExeObjects........ $(EXEOBJECTS)'#010+
' @$(ECHO)'#010+
' @$(ECHO) ExtraCleanUnits... $(EXTRACLEANUNITS)'#010+
- ' @$(ECHO) ExtraCleanFiles... $(EXTRACLEANFILES)'#010+
+ ' @$(ECHO) ExtraCleanFiles... $(EXTRACLEANFILE','S)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) ExtraInstallUnits. $','(EXTRAINSTALLUNITS)'#010+
+ ' @$(ECHO) ExtraInstallUnits. $(EXTRAINSTALLUNITS)'#010+
' @$(ECHO) ExtraInstallFiles. $(EXTRAINSTALLFILES)'#010+
' @$(ECHO)'#010+
#010+
'[info_install]'#010+
'fpc_infoinstall:'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) == Install info =='#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 PACKAGENAME'#010+
- ' @$(ECHO) PackageName.......... $(PACKAGENAME)'#010+
+ ' @$(ECHO) PackageName.......... $(PACKAGENAME)',#010+
'endif'#010+
- ' @$(ECHO) PackageSuffix........ $(PACKAGESU','FFIX)'#010+
+ ' @$(ECHO) PackageSuffix........ $(PACKAGESUFFIX)'#010+
' @$(ECHO)'#010+
' @$(ECHO) BaseInstallDir....... $(BASEINSTALLDIR)'#010+
' @$(ECHO) BinInstallDir........ $(BININSTALLDIR)'#010+
- ' @$(ECHO) LibInstallDir........ $(LIBINSTALLDIR)'#010+
- ' @$(ECHO) UnitInstallDir....... $(UNI','TINSTALLDIR)'#010+
+ ' @$(ECHO) LibInstallDir........ $(LI','BINSTALLDIR)'#010+
+ ' @$(ECHO) UnitInstallDir....... $(UNITINSTALLDIR)'#010+
' @$(ECHO) SourceInstallDir..... $(SOURCEINSTALLDIR)'#010+
' @$(ECHO) DocInstallDir........ $(DOCINSTALLDIR)'#010+
- ' @$(ECHO) DataInstallDir....... $(DATAINSTALLDIR)'#010+
+ ' @$(ECHO) DataInstallDir....... $(DATAINSTAL','LDIR)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) DestZipDir.......','.... $(DESTZIPDIR)'#010+
+ ' @$(ECHO) DestZipDir........... $(DESTZIPDIR)'#010+
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
' @$(ECHO)'#010+
#010+
'[directorytargets]'#010+
'#####################################################################'#010+
- '# Directories'#010+
- '#################################################','###################'+
- '#'#010+
+ '# Dir','ectories'#010+
+ '#####################################################################'#010+
#010+
'[localmakefile]'#010+
'#####################################################################'#010+
'# Local Makefile'#010+
- '#####################################################################'#010+
+ '#########################################################','###########'+
+ '#'#010+
#010+
'ifneq ($(wildcard fpcmake.loc),)'#010+
- 'include fpc','make.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 fd72ee792c..4239e60127 100644
--- a/utils/fpcmake.ini
+++ b/utils/fpcmake.ini
@@ -821,6 +821,7 @@ endif
ifeq ($(OS_SOURCE),win32)
override FPCEXTCMD:=$(FPCOPT)
override FPCOPT:=!FPCEXTCMD
+export FPCEXTCMD
endif
[command_compiler]