./trunk/gcc420/vcs_diff_utils.patch 2026-07-05-09:27
$(FPC)'#010+
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index 9a25496b61..b9ca7a7639 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1999,11 +1999,12 @@
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
+ 'ifneq($(EXEEXT),)'#010+
'%$(EXEEXT): %.pp'#010+
' $(COMPILER) $<'#010+
- ' $(EXECPPAS)'#010+
+ ' $(EXECPPAS)',#010+
#010+
- '%$(EXEEXT): %.pa','s'#010+
+ '%$(EXEEXT): %.pas'#010+
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
#010+
@@ -2014,22 +2015,23 @@
'%$(EXEEXT): %.dpr'#010+
' $(COMPILER) $<'#010+
' $(EXECPPAS)'#010+
+ 'endif'#010+
#010+
'%.res: %.rc'#010+
' windres -i $< -o $@'#010+
#010+
- '# Search paths for .ppu, .pp,',' .pas, .lpr, .dpr'#010+
+ '# Sea','rch paths for .ppu, .pp, .pas, .lpr, .dpr'#010+
'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
- 'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDE','DIR)'#010+
+ 'vpath %.dpr $(COMPILER_SOURC','EDIR) $(COMPILER_INCLUDEDIR)'#010+
'vpath %.inc $(COMPILER_INCLUDEDIR)'#010+
'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+
'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
#010+
'[sharedrules]'#010+
- '##########################################################','##########'+
+ '##################################','##################################'+
'#'#010+
'# Library'#010+
'#####################################################################'#010+
@@ -2040,9 +2042,9 @@
#010+
'ifndef SHARED_LIBVERSION'#010+
'SHARED_LIBVERSION=$(FPC_VERSION)'#010+
- 'endif'#010+
+ 'e','ndif'#010+
#010+
- 'ifndef SHARED_LIBN','AME'#010+
+ 'ifndef SHARED_LIBNAME'#010+
'SHARED_LIBNAME=$(PACKAGE_NAME)'#010+
'endif'#010+
#010+
@@ -2052,43 +2054,42 @@
'endif'#010+
#010+
'# Default sharedlib units are all unit objects'#010+
- 'ifndef SHARED_LIBUNITS'#010+
- 'SHARED_LIB','UNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
+ 'ifndef SH','ARED_LIBUNITS'#010+
+ 'SHARED_LIBUNITS:=$(TARGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+
'IBUNITS))'#010+
'endif'#010+
#010+
'fpc_shared:'#010+
'ifdef HASSHAREDLIB'#010+
- ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
- 'ifneq ($(SHAR','ED_BUILD),n)'#010+
+ ' $(MAKE) all CREATESHARED=1 LINKSHARED=1 CRE','ATESMART=1'#010+
+ 'ifneq ($(SHARED_BUILD),n)'#010+
' $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+
'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+
'endif'#010+
'else'#010+
' @$(ECHO) Shared Libraries not supported'#010+
- 'endif'#010+
+ 'endif'#010,
#010+
'fpc_shared_install:'#010+
- 'ifn','eq ($(SHARED_BUILD),n)'#010+
+ 'ifneq ($(SHARED_BUILD),n)'#010+
'ifneq ($(SHARED_LIBUNITS),)'#010+
'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
' $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
'ALL_SHAREDDIR)'#010+
'endif'#010+
'endif'#010+
- 'endif'#010+
+ 'en','dif'#010+
#010+
'[installrules]'#010+
- '####','################################################################'+
- '#'#010+
+ '#####################################################################'#010+
'# Install rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
#010+
- 'ifdef INSTALL_UNITS'#010+
- 'override ','INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
+ 'ifdef',' INSTALL_UNITS'#010+
+ 'override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
'endif'#010+
#010+
'ifdef INSTALL_BUILDUNIT'#010+
@@ -2097,28 +2098,27 @@
'endif'#010+
#010+
'ifdef INSTALLPPUFILES'#010+
- '# Avoid getting the same name twic','e as some install EXE fail'#010+
+ '# Avoid ge','tting the same name twice as some install EXE fail'#010+
'# in this case, happends for instance for OS/2 target'#010+
'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+
'IBEXT))'#010+
- 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
- 'LES)) $(sub','st $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$','(INSTALLPPU'+
+ 'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+
'NSTALLPPUFILES)))'#010+
- 'else'#010+
- 'override INSTALLPPUL','INKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
- 'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
- 'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
- ')'#010+
+ 'e','lse'#010+
+ 'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
+ 'LES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $(ST'+
+ 'ATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))'#010+
'endif'#010+
#010+
- 'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
- 'override IN','STALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
+ 'ifneq ($(UNITTARGET','DIRPREFIX),)'#010+
+ 'override INSTALLPPUFILENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+
'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+
'PUFILENAMES))'#010+
- 'override INSTALLPPULINKFILES=$(wildcard $','(addprefix $(UNITTARGETDIRP'+
+ 'override INSTALLP','PULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRP'+
'REFIX),$(INSTALLPPULINKFILENAMES)))'#010+
'endif'#010+
'# Implicitly install Package.fpc'#010+
@@ -2127,7 +2127,7 @@
#010+
'ifdef INSTALLEXEFILES'#010+
'ifneq ($(TARGETDIRPREFIX),)'#010+
- 'override INSTALLEXEFILES:=$(addprefix $(TARGE','TDIRPREFIX),$(notdir $('+
+ 'override INSTALLEXEFI','LES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $('+
'INSTALLEXEFILES)))'#010+
'endif'#010+
'endif'#010+
@@ -2137,21 +2137,21 @@
' $(MKDIR) $(INSTALL_BINDIR)'#010+
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
'endif'#010+
- 'ifdef INSTALL_CREATEPACKAGEFP','C'#010+
+ 'ifdef',' INSTALL_CREATEPACKAGEFPC'#010+
'ifdef FPCMAKE'#010+
'# If the fpcpackage variable is set then create and install Package.fp'+
'c,'#010+
'# a safety check is done if Makefile.fpc is available'#010+
'ifdef PACKAGE_VERSION'#010+
'ifneq ($(wildcard Makefile.fpc),)'#010+
- 'ifdef FPCMAKENEW'#010+
- ' $(MKDIR) $(INSTA','LL_UNITDIR)'#010+
+ 'ifdef FPCMAKENEW'#010,
+ ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(FPCMAKENEW) -o $(INSTALL_UNITDIR)/Package.fpc -p -T$(CPU_TAR'+
'GET)-$(OS_TARGET) Makefile.fpc'#010+
'else'#010+
' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
- ' $(MKDIR) $(INSTALL_UNITDIR)'#010+
- ' $(INSTALL) Pac','kage.fpc $(INSTALL_UNITDIR)'#010+
+ ' $(MKDIR) $(INSTALL_UNITDIR',')'#010+
+ ' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
'endif'#010+
'endif'#010+
'endif'#010+
@@ -2161,15 +2161,15 @@
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+
- ' $(INSTALL) $(INSTALLPPULINK','FILES) $(INSTALL_UNITDIR)'#010+
+ ' $(I','NSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
'endif'#010+
'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
' $(MKDIR) $(INSTALL_LIBDIR)'#010+
' $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
'ifdef inUnix'#010+
- ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
+ ' ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDI','R)/$(LIB_NAME)'#010+
+ 'endif'#010+
'endif'#010+
- 'end','if'#010+
'endif'#010+
'ifdef INSTALL_FILES'#010+
' $(MKDIR) $(INSTALL_DATADIR)'#010+
@@ -2178,7 +2178,7 @@
#010+
'fpc_sourceinstall: distclean'#010+
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
- ' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOU','RCEDIR)'#010+
+ ' $(COPYTREE) $(','BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
#010+
'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+
'ARGET_EXAMPLEDIRS))'#010+
@@ -2186,7 +2186,7 @@
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
'ifdef EXAMPLESOURCEFILES'#010+
- ' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMP','LEDIR)'#010+
+ ' $(COPY) $(EXAMPLESOUR','CEFILES) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
@@ -2195,9 +2195,8 @@
#010+
'[distinstallrules]'#010+
'#####################################################################'#010+
- '# Dist Install'#010+
- '###########','#########################################################'+
- '#'#010+
+ '# ','Dist Install'#010+
+ '#####################################################################'#010+
#010+
'.PHONY: fpc_distinstall'#010+
#010+
@@ -2206,14 +2205,13 @@
#010+
'[zipinstallrules]'#010+
'#####################################################################'#010+
- '# Zip'#010+
- '###################','#################################################'+
- '#'#010+
+ '#',' Zip'#010+
+ '#####################################################################'#010+
#010+
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
#010+
'# Temporary path to pack a file, can only use a single deep'#010+
- '# subdir, because the deltree can'#039't see the whole tree to rem','ove'+
+ '# subdir, because the deltree can'#039't s','ee the whole tree to remove'+
#010+
'ifndef PACKDIR'#010+
'ifndef inUnix'#010+
@@ -2228,8 +2226,8 @@
'ifdef DIST_ZIPNAME'#010+
'ZIPNAME=$(DIST_ZIPNAME)'#010+
'else'#010+
- 'ZIPNAME=$(PACKAGE_NAME)'#010+
- 'e','ndif'#010+
+ 'Z','IPNAME=$(PACKAGE_NAME)'#010+
+ 'endif'#010+
'endif'#010+
#010+
'ifndef FULLZIPNAME'#010+
@@ -2245,7 +2243,7 @@
'endif'#010+
'endif'#010+
#010+
- '# Use tar by default under ','linux'#010+
+ '# U','se tar by default under linux'#010+
'ifndef USEZIP'#010+
'ifdef inUnix'#010+
'USETAR=1'#010+
@@ -2259,8 +2257,8 @@
#010+
'# We need to be able to run in the current OS so fix'#010+
'# the path separator'#010+
- 'ifdef USEZIPWRAPPER'#010+
- 'ZIPPATHSEP=','$(PATHSEP)'#010+
+ 'ifdef U','SEZIPWRAPPER'#010+
+ 'ZIPPATHSEP=$(PATHSEP)'#010+
'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
'else'#010+
'ZIPPATHSEP=/'#010+
@@ -2268,13 +2266,13 @@
#010+
'# Create commands to create the zip/tar file'#010+
'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
- 'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPA','THSEP),$(BASEDIR))'#010+
+ 'ZIPCMD_CDBA','SE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
'ifdef USETAR'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
'else'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
- 'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG',')) -Dr $(ZIPOPT) $(ZIPD'+
+ 'ZIPCMD_ZIP:=$(subst /',',$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+
'ESTFILE) *'#010+
'endif'#010+
#010+
@@ -2283,13 +2281,13 @@
' $(MKDIR) $(DIST_DESTDIR)'#010+
' $(DEL) $(ZIPDESTFILE)'#010+
'ifdef USEZIPWRAPPER'#010+
- '# Handle gecho separate as we ne','ed to espace \ with \\'#010+
+ '# Handle',' gecho separate as we need to espace \ with \\'#010+
'ifneq ($(ECHOREDIR),echo)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
'R)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
#010+
- ' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_','CDBASE))" >> $(ZIPWRA'+
+ ' $(ECHOREDIR) -e',' "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRA'+
'PPER)'#010+
'else'#010+
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
@@ -2297,10 +2295,10 @@
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
'endif'#010+
'ifdef inUnix'#010+
- ' /bin/sh $(ZIPWRAPPER)'#010+
+ ' /bin/sh $(ZIPWRAPPER',')'#010+
'else'#010+
'ifdef RUNBATCH'#010+
- ' ',' $(RUNBATCH) $(ZIPWRAPPER)'#010+
+ ' $(RUNBATCH) $(ZIPWRAPPER)'#010+
'else'#010+
' $(ZIPWRAPPER)'#010+
'endif'#010+
@@ -2311,9 +2309,9 @@
'endif'#010+
' $(DELTREE) $(PACKDIR)'#010+
#010+
- 'fpc_zipsourceinstall:'#010+
- ' $(MAKE) ','fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(Z'+
- 'IPSOURCESUFFIX)'#010+
+ 'fpc_zipsourcei','nstall:'#010+
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+
+ 'SOURCESUFFIX)'#010+
#010+
'fpc_zipexampleinstall:'#010+
'ifdef HASEXAMPLES'#010+
@@ -2321,8 +2319,8 @@
'PEXAMPLESUFFIX)'#010+
'endif'#010+
#010+
- 'fpc_zipdistinstall:'#010+
- ' $(MAKE) f','pc_zipinstall ZIPTARGET=distinstall'#010+
+ 'fpc_zipdistin','stall:'#010+
+ ' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
#010+
#010+
'[cleanrules]'#010+
@@ -2330,7 +2328,7 @@
'# Clean rules'#010+
'#####################################################################'#010+
#010+
- '.PHONY: fpc_clean fpc_cleanall fpc','_distclean'#010+
+ '.PHONY: fp','c_clean fpc_cleanall fpc_distclean'#010+
#010+
'ifdef EXEFILES'#010+
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
@@ -2340,11 +2338,11 @@
'endif'#010+
#010+
'ifdef CLEAN_PROGRAMS'#010+
- 'override CLEANEXEFILES+=$(addpref','ix $(TARGETDIRPREFIX),$(addsuffix $'+
+ 'override ','CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $'+
'(EXEEXT), $(CLEAN_PROGRAMS)))'#010+
'override ALL_CLEANEXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefi'+
'x $(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(CLEAN_PROGRAMS))))'#010+
- 'override CLEANEXEDBGFILES+=$(addprefix ','$(TARGETDIRPREFIX),$(addsuffi'+
+ 'override CLEANE','XEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffi'+
'x $(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+
'endif'#010+
#010+
@@ -2353,19 +2351,19 @@
'endif'#010+
#010+
'ifdef CLEANPPUFILES'#010+
- 'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEAN','PPUFILE'+
+ 'override CLEANPPULINKFILES:=$(subst $','(PPUEXT),$(OEXT),$(CLEANPPUFILE'+
'S)) $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATIC'+
'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+
- 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+
- 'ILES)))'#010+
- 'ifdef DEBUGSYME','XT'#010+
+ 'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPU',
+ 'FILES)))'#010+
+ 'ifdef DEBUGSYMEXT'#010+
'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
'UFILES))'#010+
'endif'#010+
'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+
'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+
'LENAMES))'#010+
- 'override CLEANPPULINKFILENA','MES:=$(CLEANPPULINKFILES)'#010+
+ 'ove','rride CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+
'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UNITTARGETDIRPREFI'+
'X),$(CLEANPPULINKFILENAMES)))'#010+
'endif'#010+
@@ -2373,8 +2371,8 @@
'fpc_clean: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+
- 'endif'#010+
- '# DELTREE instead of D','EL because on Mac OS X these are directories'#010+
+ 'endi','f'#010+
+ '# DELTREE instead of DEL because on Mac OS X these are directories'#010+
'ifdef CLEANEXEDBGFILES'#010+
' -$(DELTREE) $(CLEANEXEDBGFILES)'#010+
'endif'#010+
@@ -2382,7 +2380,7 @@
' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
- ' -$(DEL) $(CLEANPPULINKFILES)'#010,
+ ' -$(DE','L) $(CLEANPPULINKFILES)'#010+
'endif'#010+
'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
@@ -2392,15 +2390,14 @@
'endif'#010+
'ifdef LIB_NAME'#010+
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
- 'endif'#010+
- ' -$(DEL) $(F','PCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT'+
- ')'#010+
+ 'e','ndif'#010+
+ ' -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+
' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
'ipt.res *_link.res symbol_order*.fpc'#010+
- ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+
- 'TCHEXT)'#010+
+ ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ','ppaslink$('+
+ 'BATCHEXT)'#010+
#010+
- 'fpc','_cleanall: $(CLEANTARGET)'#010+
+ 'fpc_cleanall: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
@@ -2409,8 +2406,8 @@
'endif'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
'ifdef CLEANPPUFILES'#010+
- ' -$(DEL) $(CLEANPPUFILES)'#010+
- 'endif'#010,
+ ' -$(DEL)',' $(CLEANPPUFILES)'#010+
+ 'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $(CLEANPPULINKFILES)'#010+
'endif'#010+
@@ -2419,22 +2416,22 @@
'endif'#010+
'endif'#010+
'ifdef CLEAN_FILES'#010+
- ' -$(DEL) $(CLEAN_FILES)'#010+
+ ' -$(DEL) $(CLEAN_','FILES)'#010+
'endif'#010+
- ' -$(','DELTREE) units'#010+
+ ' -$(DELTREE) units'#010+
' -$(DELTREE) bin'#010+
' -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+
'$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
'ifneq ($(PPUEXT),.ppu)'#010+
' -$(DEL) *.o *.ppu *.a'#010+
'endif'#010+
- ' -$(DELTREE) *$(SMART','EXT)'#010+
+ ' ',' -$(DELTREE) *$(SMARTEXT)'#010+
' -$(DEL) fpcmade.* Package*.fpc *.fpm'#010+
' -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
'ipt.res *_link.res symbol_order*.fpc'#010+
- ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+
- 'TCHEXT)'#010+
- 'ifdef',' AOUTEXT'#010+
+ ' -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) p','paslink$('+
+ 'BATCHEXT)'#010+
+ 'ifdef AOUTEXT'#010+
' -$(DEL) *$(AOUTEXT)'#010+
'endif'#010+
'ifdef DEBUGSYMEXT'#010+
@@ -2445,12 +2442,11 @@
' -$(DEL) $(FPMAKEBINOBJ)'#010+
'endif'#010+
#010+
- 'fpc_distclean: cleanall'#010+
+ 'fpc_distclean: cleanall',#010+
#010+
#010+
'[baseinforules]'#010+
- '#####','###############################################################'+
- '#'#010+
+ '#####################################################################'#010+
'# Base info rules'#010+
'#####################################################################'#010+
#010+
@@ -2458,100 +2454,101 @@
#010+
'override INFORULES+=fpc_baseinfo'#010+
#010+
- 'fpc_baseinfo:'#010+
- ' @$(ECHO)',#010+
+ 'fpc_ba','seinfo:'#010+
+ ' @$(ECHO)'#010+
' @$(ECHO) == Package info =='#010+
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+
- ' @$(ECHO)'#010+
- ' @$(ECHO) ','FPC.......... $(FPC)'#010+
+ ' @$(','ECHO)'#010+
+ ' @$(ECHO) FPC.......... $(FPC)'#010+
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
- ' @$(ECHO) Target OS.... $(O','S_TARGET)'#010+
+ ' @$(','ECHO) Target OS.... $(OS_TARGET)'#010+
' @$(ECHO) Full Source.. $(FULL_SOURCE)'#010+
' @$(ECHO) Full Target.. $(FULL_TARGET)'#010+
' @$(ECHO) SourceSuffix. $(SOURCESUFFIX)'#010+
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
- ' @$(ECHO) FPC fpmake... $(FPCFPM','AKE)'#010+
+ ' @$(ECHO)',' FPC fpmake... $(FPCFPMAKE)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Directory info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
- ' @$(ECHO) FPCDir.......... $(FPCDIR)',#010+
+ ' @$(ECHO) FP','CDir.......... $(FPCDIR)'#010+
' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
- ' @$(ECHO) Other lib','rary... $(OTHERLIBDIR)'#010+
+ ' ',' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Tools info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) As........ $(AS)'#010+
' @$(ECHO) Ld........ $(LD)'#010+
' @$(ECHO) Ar........ $(AR)'#010+
- ' @$(ECHO) Rc........ $(RC)'#010+
- ' ','@$(ECHO)'#010+
+ ' @$(ECHO) R','c........ $(RC)'#010+
+ ' @$(ECHO)'#010+
' @$(ECHO) Mv........ $(MVPROG)'#010+
' @$(ECHO) Cp........ $(CPPROG)'#010+
' @$(ECHO) Rm........ $(RMPROG)'#010+
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
' @$(ECHO) Echo...... $(ECHO)'#010+
- ' @$(ECHO) Shell..... $(SHELL',')'#010+
+ ' @$(E','CHO) Shell..... $(SHELL)'#010+
' @$(ECHO) Date...... $(DATE)'#010+
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
' @$(ECHO) Zip....... $(ZIPPROG)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+
- ' @$(ECHO)'#010+
- ' @$(','ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
+ ' ',' @$(ECHO)'#010+
+ ' @$(ECHO) Target Loaders........ $(TARGET_LOADERS)'#010+
' @$(ECHO) Target Units.......... $(TARGET_UNITS)'#010+
' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
- ' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+
- ' @$','(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
+ ' @$(ECHO) Target Programs....... $(TAR','GET_PROGRAMS)'#010+
+ ' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Clean Units......... $(CLEAN_UNITS)'#010,
+ ' @$(ECHO) Clean Units.','........ $(CLEAN_UNITS)'#010+
' @$(ECHO) Clean Files......... $(CLEAN_FILES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Install Units....... $(INSTALL_UNITS)'#010+
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) == Install info =='#010+
- ' ',' @$(ECHO)'#010+
+ ' @$(ECHO)',' == Install info =='#010+
+ ' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
- ' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
- ' @$(EC','HO) ZipSuffix............ $(ZIPSUFFIX)'#010+
+ ' @$(ECHO) ZipCrossPrefix....... $(ZIPCR','OSSPREFIX)'#010+
+ ' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Install base dir..... $(INSTALL_BASEDIR)'#010+
- ' ',' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+
+ ' @$(ECHO) Install base dir..... $(','INSTALL_BASEDIR)'#010+
+ ' @$(ECHO) Install binary dir... $(INSTALL_BINDIR)'#010+
' @$(ECHO) Install library dir.. $(INSTALL_LIBDIR)'#010+
' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
- ' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
- ' @$(','ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
+ ' @$(ECHO) Install source dir... $(INSTAL','L_SOURCEDIR)'#010+
+ ' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)',#010+
+ ' @$(ECHO) Dist destinat','ion dir. $(DIST_DESTDIR)'#010+
' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
' @$(ECHO)'#010+
#010+
'[inforules]'#010+
'#####################################################################'#010+
'# Info rules'#010+
- '#####################################################################'#010,
+ '##############################################','######################'+
+ '#'#010+
#010+
'.PHONY: fpc_info'#010+
#010+
@@ -2560,10 +2557,11 @@
'[makefilerules]'#010+
'#####################################################################'#010+
'# Rebuild Makefile'#010+
- '#####################################################################'#010+
+ '####################################################################','#'+
+ #010+
#010+
- '.PHONY: fpc_makefile ','fpc_makefiles fpc_makefile_sub1 fpc_makefile_su'+
- 'b2 \'#010+
+ '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
+ ' \'#010+
' fpc_makefile_dirs'#010+
#010+
'fpc_makefile:'#010+
@@ -2571,7 +2569,7 @@
#010+
'fpc_makefile_sub1:'#010+
'ifdef TARGET_DIRS'#010+
- ' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.','fpc,$(TAR'+
+ ' $(FPCMAKE) -w -T$(OS_TARGET',') $(addsuffix /Makefile.fpc,$(TAR'+
'GET_DIRS))'#010+
'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+
@@ -2580,16 +2578,16 @@
'endif'#010+
#010+
'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
- 'EXAMPLEDIRS))'#010+
+ 'EX','AMPLEDIRS))'#010+
#010+
- 'fpc_makefil','e_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
+ 'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
#010+
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
#010+
'[localmakefile]'#010+
'#####################################################################'#010+
'# Local Makefile'#010+
- '#############################################','#######################'+
+ '#####################','###############################################'+
'#'#010+
#010+
'ifneq ($(wildcard fpcmake.loc),)'#010+
@@ -2600,7 +2598,7 @@
'[userrules]'#010+
'#####################################################################'#010+
'# Users rules'#010+
- '#########################################################','###########'+
+ '#################################','###################################'+
'#'#010+
#010+
'[lclrules]'#010+
@@ -2610,7 +2608,7 @@
#010+
'# LCL Platform'#010+
'ifndef LCL_PLATFORM'#010+
- 'ifneq ($(filter $(OS_TARGET','),win32 win64),)'#010+
+ 'ifn','eq ($(filter $(OS_TARGET),win32 win64),)'#010+
'LCL_PLATFORM=win32'#010+
'else'#010+
'LCL_PLATFORM=gtk'#010+
@@ -2621,8 +2619,8 @@
'# Check if the specified LCLDIR is correct'#010+
'ifdef LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
- 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
- 'o','verride LCLDIR=wrong'#010+
+ 'ifeq ($(wildcard $(LCLDIR)/un','its/$(LCL_PLATFORM)),)'#010+
+ 'override LCLDIR=wrong'#010+
'endif'#010+
'else'#010+
'override LCLDIR=wrong'#010+
@@ -2631,8 +2629,8 @@
'# Check if the default LCLDIR is correct'#010+
'ifdef DEFAULT_LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
- 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
- 'override LCLDIR=w','rong'#010+
+ 'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFO','RM)),)'#010+
+ 'override LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
@@ -2640,8 +2638,8 @@
'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
- 'ifeq ($(LCLDIR),)'#010+
- 'override LCLD','IR=wrong'#010+
+ 'ifeq ($','(LCLDIR),)'#010+
+ 'override LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
@@ -2649,8 +2647,8 @@
'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
- 'ifeq ($(LCLDIR),)'#010+
- 'override LC','LDIR=wrong'#010+
+ 'ifeq ','($(LCLDIR),)'#010+
+ 'override LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
@@ -2659,17 +2657,17 @@
'R)/units)'#010+
'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../componen'+
'ts $(LCLDIR)/components)'#010+
- 'export LCLDIR LCLUNITDIR ','LCLCOMPONENTDIR'#010+
+ 'e','xport LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
#010+
'# Add LCL dirs to paths'#010+
'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
#010+
'[lclinforules]'#010+
- '#####################################################################'#010+
+ '#####################################################################',
+ #010+
'# LCL Info rules'#010+
- '######','##############################################################'+
- '#'#010+
+ '#####################################################################'#010+
'override INFORULES+=lclinfo'#010+
#010+
'.PHONY: lclinfo'#010+
@@ -2677,14 +2675,14 @@
'lclinfo:'#010+
' @$(ECHO) == LCL info =='#010+
' @$(ECHO)'#010+
- ' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
- ' @$(ECHO',') LCLDIR............... $(LCLDIR)'#010+
+ ' @$(ECHO) Platform............. $(LCL_P','LATFORM)'#010+
+ ' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
' @$(ECHO)'#010+
#010+
'[fpmakeprerules]'#010+
- '#########################################################','###########'+
+ '#################################','###################################'+
'#'#010+
'# fpmake prerules'#010+
'#####################################################################'#010+
@@ -2692,7 +2690,7 @@
'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+
'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+
#010+
- '# Convert the OS_TARGET and',' CPU_TARGET options to fpmake'#039's --os '+
+ '# C','onvert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os '+
'and --cpu parameters'#010+
'ifdef OS_TARGET'#010+
'FPC_TARGETOPT+=--os=$(OS_TARGET)'#010+
@@ -2701,35 +2699,36 @@
'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+
'endif'#010+
'ifdef SUB_TARGET'#010+
- 'FPC_TARGETOPT+=--subtarget=$(SUB_TARGET)'#010+
+ 'FPC_TARGETOPT+=--subtarget=$','(SUB_TARGET)'#010+
'endif'#010+
#010+
- '# Ge','t the location of the bootstrap-fpmkunit units'#010+
+ '# Get the location of the bootstrap-fpmkunit units'#010+
'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+
'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+
'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+
- 'UNITDIR_FPMAKE_FPMKUNIT=$(PACKA','GEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+
+ 'UNITDIR','_FPMAKE_FPMKUNIT=$(PACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+
'IX)'#010+
'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+
'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+
'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+
'endif'#010+
#010+
- 'ifdef FPMAKE_SKIP_CONFIG'#010+
- 'ov','erride FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+
+ 'ifd','ef FPMAKE_SKIP_CONFIG'#010+
+ 'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+
'endif'#010+
#010+
'[fpmakerules]'#010+
'#####################################################################'#010+
'# fpmake rules'#010+
- '#####################################################################'#010+
- '.PHONY: fpc_fpmak','e fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_ex'+
- 'ampleinstall'#010+
+ '###############################################################','#####'+
+ '#'#010+
+ '.PHONY: fpc_fpmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_exam'+
+ 'pleinstall'#010+
#010+
'# Do not pass the Makefile'#039's unit and binary target locations. fpm'+
'ake uses it'#039's own.'#010+
'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+
- 'override FPCOPT:=$(filter-out -FE%,$(FPCOPT)',')'#010+
+ 'override FPCOPT:=$(f','ilter-out -FE%,$(FPCOPT))'#010+
'# Compose general fpmake-parameters'#010+
'ifdef FPMAKEOPT'#010+
'FPMAKE_OPT+=$(FPMAKEOPT)'#010+
@@ -2737,8 +2736,8 @@
'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+
'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+
'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+
- 'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+
- 'FPM','AKE_OPT+=--compiler=$(FPC)'#010+
+ 'FPMAKE_OPT+=$(addp','refix -o ,$(FPCOPT))'#010+
+ 'FPMAKE_OPT+=--compiler=$(FPC)'#010+
'FPMAKE_OPT+=-bu'#010+
'ifdef FPC_DOTTEDUNITS'#010+
'FPMAKE_OPT+=-ns'#010+
@@ -2747,7 +2746,7 @@
'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+
'ifdef UNIXHier'#010+
'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+
- 'FPMAKE_INSTALL_OPT+=--baseinstalld','ir=$(INSTALL_LIBDIR)/fpc/$(FPC_VER'+
+ 'FPMAKE_INS','TALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VER'+
'SION)'#010+
'else'#010+
'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+
@@ -2755,13 +2754,13 @@
#010+
'override ALLTARGET+=fpc_fpmake'#010+
'override INSTALLTARGET+=fpc_fpmake_install'#010+
- 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+
- '# If no f','pmake exists and (dist)clean is called, do not try to build'+
- ' fpmake, it will'#010+
+ 'override EXAMPLEINSTALLTARGET+=fpc_fpmake_','exampleinstall'#010+
+ '# If no fpmake exists and (dist)clean is called, do not try to build f'+
+ 'pmake, it will'#010+
'# most often fail because the dependencies are cleared.'#010+
'# In case of a clean, simply do nothing'#010+
'ifneq ($(wildcard $(LOCALFPMAKEBIN)),)'#010+
- 'override CLEANTARGET+=fpc_fpm','ake_clean'#010+
+ 'overr','ide CLEANTARGET+=fpc_fpmake_clean'#010+
'endif'#010+
#010+
'$(FPMKUNIT_PPU): $(FPMKUNIT_SRC)'#010+
@@ -2769,7 +2768,7 @@
'T=,$(FPMAKE_BUILD_OPT))'#010+
#010+
'$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+
- ' $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPIL','ER_FPMAKE_UNI'+
+ ' $(FPCFPMAKE) fpmake.pp ','$(addprefix -Fu,$(COMPILER_FPMAKE_UNI'+
'TDIR)) $(FPMAKE_BUILD_OPT)'#010+
#010+
'fpc_fpmake: $(FPMAKEBIN)'#010+
@@ -2778,15 +2777,15 @@
'fpc_fpmake_clean: $(FPMAKEBIN)'#010+
' $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+
#010+
- 'fpc_fpmake_install: $(FPMAKEBIN)'#010+
- ' ',' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL'+
- '_OPT)'#010+
+ 'fpc_fpmake_inst','all: $(FPMAKEBIN)'#010+
+ ' $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(FPMAKE_INSTALL_O'+
+ 'PT)'#010+
#010+
'# This is not completely valid. Exampleinstall should only install the'+
' examples, while'#010+
- '# fpmake -ie installs everything, including the examples. This also me'+
- 'ans that on'#010+
- '# ','a distinstall fpmake install wil be called twice.'#010+
+ '# fpmake -ie installs everything, including the examples. Th','is also '+
+ 'means that on'#010+
+ '# a distinstall fpmake install wil be called twice.'#010+
'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+
' $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+
'LL_OPT)'#010