* strip dir from ppu when installing

This commit is contained in:
peter 2005-01-31 20:40:05 +00:00
parent cdffc6e8b0
commit 3089ca7d24
2 changed files with 180 additions and 168 deletions

View File

@ -1,7 +1,7 @@
{$ifdef Delphi}
const fpcmakeini : array[0..204] of string[240]=(
const fpcmakeini : array[0..205] of string[240]=(
{$else Delphi}
const fpcmakeini : array[0..204,1..240] of char=(
const fpcmakeini : array[0..205,1..240] of char=(
{$endif Delphi}
';'#010+
'; Templates used by fpcmake to create a Makefile from Makefile.fpc'#010+
@ -1702,100 +1702,107 @@ const fpcmakeini : array[0..204,1..240] of char=(
'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+
',$(INSTALLPPUFILES)))'#010+
'override INSTALLPPUFILES:=$(addprefix $(UN','ITTARGETDIRPREFIX),$(INSTA'+
'LLPPUFILES))'#010+
'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
'override I','NSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdi'+
'r $(INSTALLPPUFILES)))'#010+
'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
'EFIX),$(INSTALLPPULINKFILES)))'#010+
'EFIX),$(notdir $(INSTALLPPULINKFILES))))'#010+
'endif'#010+
'# Implicitly install Package.fpc'#010+
'override INSTALL_CREATEPACKAGEFPC=1'#010+
'override ','INSTALL_CREATEPACKAGEFPC=1'#010+
'endif'#010+
#010+
'ifdef INSTALLEXEFILES'#010+
'ov','erride INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEX'+
'EFILES))'#010+
'ifneq ($(TARGETDIRPREFIX),)'#010+
'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(IN'+
'STALLEXEFILES)))'#010+
'endif'#010+
'endif'#010+
#010+
'fpc_install: all $(INSTALLTARGET)'#010+
'ifdef INSTALLEXEFILES'#010+
'ifdef INSTALLEXEFILES'#010,
' $(MKDIR) $(INSTALL_BINDIR)'#010+
'# Compress the exes if upx is defined'#010+
'ifdef UPXPROG'#010+
' -$(UPXP','ROG) $(INSTALLEXEFILES)'#010+
' -$(UPXPROG) $(INSTALLEXEFILES)'#010+
'endif'#010+
' $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
'endif'#010+
'ifdef INSTALL_CREATEPACKAGEFPC'#010+
'ifdef FPCMAKE'#010+
'ifdef FPCMAK','E'#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+
'# a safety check is done if Makefile.fpc is available'#010+
'ifdef PACKAGE_VERSION'#010+
'ifneq ($(wildcard Makefile.fpc),)'#010+
' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc'#010+
' $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Make','file.fpc'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
'endif'#010+
'e','ndif'#010+
'endif'#010+
'endif'#010+
'endif'#010+
'ifdef INSTALLPPUFILES'#010+
' $(MKDIR) $(INSTALL_UNITDIR)'#010+
' $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
'ifneq ($(INSTALLPPULINKFILES),)'#010+
'ifneq ','($(INSTALLPPULINKFILES),)'#010+
' $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
'endif'#010+
'ifneq ($(','wildcard $(LIB_FULLNAME)),)'#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+
' l','n -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
'endif'#010+
'endif'#010+
'endif'#010+
'ifdef INSTALL_FILES'#010+
' $(MK','DIR) $(INSTALL_DATADIR)'#010+
' $(MKDIR) $(INSTALL_DATADIR)'#010+
' $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
'endif'#010+
#010+
'fpc_sourceinstall: distclean'#010+
' $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
' $(MKDIR) $(INST','ALL_SOURCEDIR)'#010+
' $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
#010+
'fpc_exampleinstall: $(addsuffix ','_distclean,$(TARGET_EXAMPLEDIRS))'#010+
'fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
'ifdef HASEXAMPLES'#010+
' $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
'ifdef EXAMPLESOURCEFILES'#010+
' $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
' $(COPY) ','$(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+
' $(COPYTREE) $(addsu','ffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_'+
'EXAMPLEDIR)'#010+
' $(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EX'+
'AMPLEDIR)'#010+
'endif'#010+
#010+
'[distinstallrules]'#010+
'#####################################################################'#010+
'###########################################################','#########'+
'#'#010+
'# Dist Install'#010+
'#####################################################################'#010+
#010+
'.PHON','Y: fpc_distinstall'#010+
'.PHONY: fpc_distinstall'#010+
#010+
'fpc_distinstall: install exampleinstall'#010+
#010+
#010+
'[zipinstallrules]'#010+
'#####################################################################'#010+
'##########################################################','##########'+
'#'#010+
'# Zip'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_z','ipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
'.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
#010+
'# Temporary path to pack a file, can only use a single deep'#010+
'# subdir, because the deltree can'#039't see the whole tree to remove'#010+
'# subdir, because the de','ltree can'#039't see the whole tree to remove'+
#010+
'ifndef PACKDIR'#010+
'ifndef inUnix'#010+
'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
'e','lse'#010+
'else'#010+
'PACKDIR=/tmp/fpc-pack'#010+
'endif'#010+
'endif'#010+
@ -1803,14 +1810,14 @@ const fpcmakeini : array[0..204,1..240] of char=(
'# Maybe create default zipname from packagename'#010+
'ifndef ZIPNAME'#010+
'ifdef DIST_ZIPNAME'#010+
'ZIPNAME=$(DIST_ZIPNAME)'#010+
'ZIPNAME=$(DIST_ZI','PNAME)'#010+
'else'#010+
'ZIPNAME=$(PACKAGE_NAME)'#010+
'endif'#010+
'endif'#010+
#010+
'ifndef FULLZIPNAME'#010+
'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIP','PREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
'FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)'#010+
'endif'#010+
#010+
'# ZipTarget'#010+
@ -1819,7 +1826,7 @@ const fpcmakeini : array[0..204,1..240] of char=(
'ZIPTARGET=DIST_ZIPTARGET'#010+
'else'#010+
'ZIPTARGET=install'#010+
'endif'#010+
'end','if'#010+
'endif'#010+
#010+
'# Use tar by default under linux'#010+
@ -1829,135 +1836,110 @@ const fpcmakeini : array[0..204,1..240] of char=(
'endif'#010+
'endif'#010+
#010+
'# Use a wr','apper script by default for Os/2'#010+
'# Use a wrapper script by default for Os/2'#010+
'ifndef inUnix'#010+
'USEZIPWRAPPER=1'#010+
'endif'#010+
#010+
'# We need to be able to run in the current OS so fix'#010+
'# the path separator'#010+
'# the path sepa','rator'#010+
'ifdef USEZIPWRAPPER'#010+
'ZIPPATHSEP=$(PATHSEP)'#010+
'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip','$(SRCBATCHEXT)'+
')'#010+
'ZIPWRAPPER=$(subst /,$(PATHSEP),$(DIST_DESTDIR)/fpczip$(SRCBATCHEXT))'#010+
'else'#010+
'ZIPPATHSEP=/'#010+
'endif'#010+
#010+
'# Create commands to create the zip/tar file'#010+
'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))'#010+
'ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR)',')'#010+
'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
'ifdef USETAR'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FU','LLZIPNAME)$(TAREXT)'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
'ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *'#010+
'else'#010+
'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)'#010+
'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
'TFILE) *'#010+
'ZIPCMD_Z','IP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPD'+
'ESTFILE) *'#010+
'endif'#010+
#010+
'fpc_zipinstall:'#010+
' ','$(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
' $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
' $(MKDIR) $(DIST_DESTDIR)'#010+
' $(DEL) $(ZIPDESTFILE)'#010+
'ifdef USEZIPWRAPPER'#010+
'ifdef USEZIPWRA','PPER'#010+
'# Handle gecho separate as we need to espace \ with \\'#010+
'ifneq ($(ECHOREDIR),echo)'#010+
' $(ECHORE','DIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAP'+
'PER)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
'R)'#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)'+
#010+
' $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
'ER)'#010+
' $(','ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRA'+
'PPER)'#010+
'else'#010+
' echo $(ZIPCMD_CDPACK) > $','(ZIPWRAPPER)'#010+
' echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)'#010+
' echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
' echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
'endif'#010+
'ifdef inUnix'#010+
' /bin/sh $(ZIPWRAPPER)'#010+
' /bin/sh',' $(ZIPWRAPPER)'#010+
'else'#010+
' $(ZIPWRAPPER)'#010+
'endif'#010+
' $(DEL) $(ZIPWRAPPER)'#010+
'else'#010+
' $(ZIPCMD_CDP','ACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
' $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
'endif'#010+
' $(DELTREE) $(PACKDIR)'#010+
#010+
'fpc_zipsourceinstall:'#010+
' $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+
'SOURCESUFFIX)'#010+
' $(MAKE) fpc_zipinstall ZIPTARGE','T=sourceinstall ZIPSUFFIX=$(Z'+
'IPSOURCESUFFIX)'#010+
#010+
'fpc_zipexampleinstall:'#010+
'ifdef HASEXAMPLES'#010+
' $(MAKE)',' fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$('+
'ZIPEXAMPLESUFFIX)'#010+
' $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
'PEXAMPLESUFFIX)'#010+
'endif'#010+
#010+
'fpc_zipdistinstall:'#010+
' $(MAKE) fpc_zipinstall ZIPTARGET=distinstall'#010+
' $(MAKE) fpc_zipinstall ZIPTARGET','=distinstall'#010+
#010+
#010+
'[cleanrules]'#010+
'#####################################################################'#010+
'# Cl','ean rules'#010+
'# Clean rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
#010+
'ifdef EXEFILES'#010+
'ifdef EXEFI','LES'#010+
'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
'))'#010+
'endif'#010+
#010+
'ifdef CLEAN_UNITS'#010,
'ifdef CLEAN_UNITS'#010+
'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
'endif'#010+
#010+
'ifdef CLEANPPUFILES'#010+
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
') $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(C'+
'LEANPPUFILE','S)))'#010+
'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(O','EXT),$(CLEANPPUFILE'+
'S)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$'+
'(CLEANPPUFILES)))'#010+
'ifdef DEBUGSYMEXT'#010+
'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
'UFILES))'#010+
'endif'#010+
'override CLEANPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUF'+
'ILES))'#010+
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UN','ITTARGETDIRPR'+
'EFIX),$(CLEANPPULINKFILES)))'#010+
'override CLEANPPUFILES:=$(addp','refix $(UNITTARGETDIRPREFIX),$(CLEANPP'+
'UFILES))'#010+
'override CLEANPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREF'+
'IX),$(CLEANPPULINKFILES)))'#010+
'endif'#010+
#010+
'fpc_clean: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
'ifdef CLEANPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $','(CLEANPPULINKFILES)'#010+
'endif'#010+
'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
'endif'#010+
'ifdef CLEAN_FILES'#010+
' -$(DEL) $(CLEAN_FILES)'#010+
'endif'#010+
'ifdef LIB_NAME'#010+
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
'endif',#010+
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
'PCEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT)'#010+
#010+
'fpc_cleanall: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
'ifdef COMPI','LER_UNITTARGETDIR'#010+
'ifdef CLEANPPUFILES'#010+
'ifde','f CLEANPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
@ -1965,161 +1947,186 @@ const fpcmakeini : array[0..204,1..240] of char=(
'endif'#010+
'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
'e','ndif'#010+
'endif'#010+
'ifdef CLEAN_FILES',#010+
' -$(DEL) $(CLEAN_FILES)'#010+
'endif'#010+
'ifdef LIB_NAME'#010+
' -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
'endif'#010+
' -$(DEL) $(FPCMADE) Package.fpc $(PPAS) script.res link.res $(F'+
'PCEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *$(ASMEXT) *_ppas$(BATCHEXT',')'#010+
#010+
'fpc_cleanall: $(CLEANTARGET)'#010+
'ifdef CLEANEXEFILES'#010+
' -$(DEL) $(CLEANEXEFILES)'#010+
'endif'#010+
'ifdef COMPILER_UNITTARGETDIR'#010+
'ifdef CLEANPPUFILES'#010+
' -$(DEL) $(CLEANPPUFILES)'#010+
'endif'#010+
'ifneq ($(CLEANPPULINKFILES),)'#010+
' -$(DEL) $(CLEANPPULINKF','ILES)'#010+
'endif'#010+
'ifdef CLEANRSTFILES'#010+
' -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
'endif'#010+
'endif'#010+
' -$(DELTREE) units'#010+
' -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIB'+
'EXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
'EXT) *$(SHAREDLIBEXT) *$(PPLEXT',')'#010+
'ifneq ($(PPUEXT),.ppu)'#010+
' -$(DEL) *.o *.ppu *.a'#010+
'endif'#010+
' -$(DELTREE) *$(SMARTEXT)'#010+
' ','-$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $('+
'FPCEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) fpcmade.* Package.fpc $(PPAS) script.res link.res $(FP'+
'CEXTFILE) $(REDIRFILE)'#010+
' -$(DEL) *_ppas$(BATCHEXT)'#010+
'ifdef AOUTEXT'#010+
' -$(DEL) *$(AOUTEXT)'#010+
' ',' -$(DEL) *$(AOUTEXT)'#010+
'endif'#010+
'ifdef DEBUGSYMEXT'#010+
' -$(DEL) *$(DEBUGSYMEXT)'#010+
'endif'#010+
#010+
'fpc_distclean: c','leanall'#010+
'fpc_distclean: cleanall'#010+
#010+
#010+
'[baseinforules]'#010+
'#####################################################################'#010+
'# Base info rules'#010+
'#####################################################################'#010+
'########################','############################################'+
'#'#010+
#010+
'.PHONY: fpc_baseinfo'#010+
#010+
'override INFORULES+=fpc_baseinfo'#010,
'override INFORULES+=fpc_baseinfo'#010+
#010+
'fpc_baseinfo:'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Package info =='#010+
' @$(ECHO) Package Name..... $(PACKAGE_NAME)'#010+
' @$(ECHO) Package Version.. $(PACKAGE_VERSION)'#010+
' @$(ECHO) ',' Package Version.. $(PACKAGE_VERSION)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Configuration info =='#010+
' ',' @$(ECHO)'#010+
' @$(ECHO)'#010+
' @$(ECHO) FPC.......... $(FPC)'#010+
' @$(ECHO) FPC Version.. $(FPC_VERSION)'#010+
' @$(ECHO) Source CPU... $(CPU_SOURCE)'#010+
' @$(ECHO) Source CPU... $(CPU_S','OURCE)'#010+
' @$(ECHO) Target CPU... $(CPU_TARGET)'#010+
' @$(ECHO) Source OS.... $(OS_SOURCE)'#010+
' ',' @$(ECHO) Target OS.... $(OS_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) SourceSuffix. $(SOURCESUFFIX)'#010+
' @$(ECHO) TargetSuffix. $(TARGETSUFFIX)'#010+
' @','$(ECHO)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Directory info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Required pkgs... $(REQUIRE_PACKAGES)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' ',' @$(ECHO) Basedir......... $(BASEDIR)'#010+
' @$(ECHO) FPCDir.......... $(FPCDIR)'#010+
' @$(EC','HO) CrossBinDir..... $(CROSSBINDIR)'#010+
' @$(ECHO) CrossBinDir..... $(CROSSBINDIR)'#010+
' @$(ECHO) UnitsDir........ $(UNITSDIR)'#010+
' @$(ECHO) PackagesDir..... $(PACKAGESDIR)'#010+
' @$(ECHO)'#010+
' ',' @$(ECHO)'#010+
' @$(ECHO) GCC library..... $(GCCLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHE','RLIBDIR)'#010+
' @$(ECHO) Other library... $(OTHERLIBDIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Tools info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) As........ $(AS)'#010+
' @$(ECHO) Ld........ $(LD)'#010+
' @$(ECHO) Ld.....','... $(LD)'#010+
' @$(ECHO) Ar........ $(AR)'#010+
' @$(ECHO) Rc........ $(RC)'#010+
' @$(ECHO)'#010+
' ',' @$(ECHO) Mv........ $(MVPROG)'#010+
' @$(ECHO) Mv........ $(MVPROG)'#010+
' @$(ECHO) Cp........ $(CPPROG)'#010+
' @$(ECHO) Rm........ $(RMPROG)'#010+
' @$(ECHO) GInstall.. $(GINSTALL)'#010+
' @$(ECHO) GInstall','.. $(GINSTALL)'#010+
' @$(ECHO) Echo...... $(ECHO)'#010+
' @$(ECHO) Shell..... $(SHELL)'#010+
' @$(E','CHO) Date...... $(DATE)'#010+
' @$(ECHO) Date...... $(DATE)'#010+
' @$(ECHO) FPCMake... $(FPCMAKE)'#010+
' @$(ECHO) PPUMove... $(PPUMOVE)'#010+
' @$(ECHO) Upx....... $(UPXPROG)'#010+
' @$(ECHO) Upx....... $(UP','XPROG)'#010+
' @$(ECHO) Zip....... $(ZIPPROG)'#010+
' @$(ECHO)'#010+
' @$(ECHO) == Object info =='#010+
' ',' @$(ECHO)'#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....... $(T','ARGET_PROGRAMS)'#010+
' ',' @$(ECHO) Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
' @$(ECHO) Target Programs....... $(TARGET_PROGRAMS)'#010+
' @$(ECHO) Target Dirs........... $(TARGET_DIRS)'#010+
' @$(ECHO) Target Examples....... $(TARGET_EXAMPLES)'#010+
' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
' ',' @$(ECHO) Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Clean Unit','s......... $(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 Units....... $(','INSTALL_UNITS)'#010+
' @$(ECHO) Install Files....... $(INSTALL_FILES)'#010+
' @$(ECHO)'#010+
' @$(ECH','O) == Install info =='#010+
' @$(ECHO) == Install info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) DateStr.............. $(DATESTR)'#010+
' @$(ECHO) ZipName.............. $(ZIPNAME)'#010+
' @$(ECHO) ZipName.............. $(ZIPNA','ME)'#010+
' @$(ECHO) ZipPrefix............ $(ZIPPREFIX)'#010+
' @$(ECHO) ZipCrossPrefix....... $(ZIP','CROSSPREFIX)'#010+
' @$(ECHO) ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
' @$(ECHO) ZipSuffix............ $(ZIPSUFFIX)'#010+
' @$(ECHO) FullZipName.......... $(FULLZIPNAME)'#010+
' @$(ECHO) Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
' @$(ECHO) ',' Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Install base dir..... ','$(INSTALL_BASEDIR)'#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... $(INST','ALL_SOURCEDIR)'#010+
' ',' @$(ECHO) Install units dir.... $(INSTALL_UNITDIR)'#010+
' @$(ECHO) Install source dir... $(INSTALL_SOURCEDIR)'#010+
' @$(ECHO) Install doc dir...... $(INSTALL_DOCDIR)'#010+
' @$(ECHO) Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
' ',' @$(ECHO) Install data dir..... $(INSTALL_DATADIR)'#010+
' @$(ECHO)'#010+
' @$(ECHO) Dist destin','ation dir. $(DIST_DESTDIR)'#010+
' @$(ECHO) Dist destination dir. $(DIST_DESTDIR)'#010+
' @$(ECHO) Dist zip name........ $(DIST_ZIPNAME)'#010+
' @$(ECHO)'#010+
#010+
'[inforules]'#010+
'#####################################################################'#010+
'# Info rules'#010+
'############################################','########################'+
'#########################','###########################################'+
'#'#010+
'# Info rules'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_info'#010+
#010+
'fpc_info: $(INFORULES)'#010+
#010+
'[makefilerules]'#010+
'#####################################################################'#010+
'# Rebuild Makefile'#010+
'##################################################################','##'+
'#####################################################','###############'+
'#'#010+
'# Rebuild Makefile'#010+
'#####################################################################'#010+
#010+
'.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
' \'#010+
' fpc_makefile_dirs'#010+
#010+
'fpc_makefile:'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
' $(FPCMAKE) ','-w -T$(OS_TARGET) Makefile.fpc'#010+
#010+
'fpc_makefile_sub1:'#010+
'ifdef TARGET_DIRS'#010+
' $(FPCMAKE) -w -T$(OS_TARG','ET) $(addsuffix /Makefile.fpc,$(TAR'+
'GET_DIRS))'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
'T_DIRS))'#010+
'endif'#010+
'ifdef TARGET_EXAMPLEDIRS'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
'T_EXAMPLEDIRS))'#010+
' $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fp','c,$(TAR'+
'GET_EXAMPLEDIRS))'#010+
'endif'#010+
#010+
'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_',
'fpc_makefile_sub2: $(addsuffix _makefile_dirs,$(TARGET_DIRS) $(TARGET_'+
'EXAMPLEDIRS))'#010+
#010+
'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
@ -2127,10 +2134,10 @@ const fpcmakeini : array[0..204,1..240] of char=(
'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
#010+
'[localmakefile]'#010+
'#####################################################################'#010+
'# Local Makefile'#010+
'###################','#################################################'+
'####','################################################################'+
'#'#010+
'# Local Makefile'#010+
'#####################################################################'#010+
#010+
'ifneq ($(wildcard fpcmake.loc),)'#010+
'include fpcmake.loc'#010+
@ -2138,19 +2145,20 @@ const fpcmakeini : array[0..204,1..240] of char=(
#010+
#010+
'[userrules]'#010+
'#####################################################################'#010+
'# Users rules'#010+
'###############################','#####################################'+
'#############','#######################################################'+
'#'#010+
'# Users rules'#010+
'#####################################################################'#010+
#010+
'[lclrules]'#010+
'#####################################################################'#010+
'# LCL Rules'#010+
'#####################################################################'#010+
'#####','###############################################################'+
'#'#010+
#010+
'# LCL Platform'#010+
'ifndef LCL_PLATFORM'#010+
'i','feq ($(OS_TARGET),win32)'#010+
'ifeq ($(OS_TARGET),win32)'#010+
'LCL_PLATFORM=win32'#010+
'else'#010+
'LCL_PLATFORM=gtk'#010+
@ -2158,10 +2166,10 @@ const fpcmakeini : array[0..204,1..240] of char=(
'endif'#010+
'export LCL_PLATFORM'#010+
#010+
'# Check if the specified LCLDIR is correct'#010+
'# Check if the specified LCLDIR is corr','ect'#010+
'ifdef LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFO','RM)),)'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
'else'#010+
@ -2170,55 +2178,55 @@ const fpcmakeini : array[0..204,1..240] of char=(
#010+
'# Check if the default LCLDIR is correct'#010+
'ifdef DEFAULT_LCLDIR'#010+
'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
'overrid','e LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
'override ','LCLDIR=wrong'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
'# Check for development version'#010+
'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
' $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstwo','rd $(wildca'+
'rd $(addsuffix /units/$(LCL_PLATFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
'ifeq ($(LCLDIR),)'#010+
'overr','ide LCLDIR=wrong'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
'# Check for release version'#010+
'ifeq ($(LCLDIR),wrong)'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
' $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstwo','rd $(wildca'+
'rd $(addsuffix /lib/lazarus/units/$(LCL_PLATFORM),/usr/local /usr))))'#010+
'ifeq ($(LCLDIR),)'#010+
'ove','rride LCLDIR=wrong'#010+
'override LCLDIR=wrong'#010+
'endif'#010+
'endif'#010+
#010+
'# Generate dirs'#010+
'override LCLUNITDIR:=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLD'+
'IR)/units)'#010+
'override LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compone'+
'nts $(LCLDIR)/components)'#010+
'export LCLDIR L','CLUNITDIR LCLCOMPONENTDIR'#010+
'override ','LCLCOMPONENTDIR:=$(wildcard $(LCLDIR)/.. $(LCLDIR)/../compo'+
'nents $(LCLDIR)/components)'#010+
'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
#010+
'# Add LCL dirs to paths'#010+
'override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR)'#010+
'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
'override COMPILER_UNITDIR+=$(LCLUNITDI','R)'#010+
#010+
'[lclinforules]'#010+
'#####################################################################'#010+
'# LCL Info ru','les'#010+
'# LCL Info rules'#010+
'#####################################################################'#010+
'override INFORULES+=lclinfo'#010+
#010+
'.PHONY: lclinfo'#010+
#010+
'lclinfo:'#010+
' @$(ECHO) == LCL info =='#010+
' @','$(ECHO) == LCL info =='#010+
' @$(ECHO)'#010+
' @$(ECHO) Platform............. $(LCL_PLATFORM)'#010+
' ',' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
' @$(ECHO) LCLDIR............... $(LCLDIR)'#010+
' @$(ECHO) LCL Unit dir......... $(LCLUNITDIR)'#010+
' @$(ECHO) LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
' @$(ECHO) LCL Component dir....',' $(LCLCOMPONENTDIR)'#010+
' @$(ECHO)'#010
);

View File

@ -1642,14 +1642,18 @@ endif
ifdef INSTALLPPUFILES
override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
ifneq ($(UNITTARGETDIRPREFIX),)
override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPUFILES)))
override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(notdir $(INSTALLPPULINKFILES))))
endif
# Implicitly install Package.fpc
override INSTALL_CREATEPACKAGEFPC=1
endif
ifdef INSTALLEXEFILES
override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
ifneq ($(TARGETDIRPREFIX),)
override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdir $(INSTALLEXEFILES)))
endif
endif
fpc_install: all $(INSTALLTARGET)