diff --git a/api/Makefile b/api/Makefile index 636f4a2b5a..79131ee0b2 100644 --- a/api/Makefile +++ b/api/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -174,11 +175,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -234,7 +238,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools diff --git a/api/go32v2/Makefile b/api/go32v2/Makefile index 2baefb84f0..264386a0b2 100644 --- a/api/go32v2/Makefile +++ b/api/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -226,11 +227,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -286,7 +290,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -718,14 +722,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1030,7 +1030,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1038,7 +1038,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/api/linux/Makefile b/api/linux/Makefile index a1e059274f..75a74326aa 100644 --- a/api/linux/Makefile +++ b/api/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -226,11 +227,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -286,7 +290,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -718,14 +722,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1030,7 +1030,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1038,7 +1038,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/api/win32/Makefile b/api/win32/Makefile index e5b4c3870f..95588e98d7 100644 --- a/api/win32/Makefile +++ b/api/win32/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -226,11 +227,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -286,7 +290,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -718,14 +722,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1030,7 +1030,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1038,7 +1038,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/base/Makefile b/base/Makefile index 95045f1777..a8486bd6c8 100644 --- a/base/Makefile +++ b/base/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: info @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -187,11 +188,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -247,7 +251,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools diff --git a/compiler/Makefile b/compiler/Makefile index 9ed9a906f8..7c9f1788b8 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -278,11 +279,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -338,7 +342,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -818,14 +822,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1091,7 +1091,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1099,7 +1099,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/compiler/new/Makefile b/compiler/new/Makefile index f9ead4d6f7..7a71d0f696 100644 --- a/compiler/new/Makefile +++ b/compiler/new/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -278,11 +279,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -338,7 +342,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -752,14 +756,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1025,7 +1025,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1033,7 +1033,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/fcl/Makefile b/fcl/Makefile index d34e47cb75..d1d791a9a3 100644 --- a/fcl/Makefile +++ b/fcl/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -174,11 +175,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -234,7 +238,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools diff --git a/fcl/db/Makefile b/fcl/db/Makefile index 3f95fb6fa4..4a18748fc3 100644 --- a/fcl/db/Makefile +++ b/fcl/db/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -213,11 +214,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -273,7 +277,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -782,14 +786,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1094,7 +1094,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1102,7 +1102,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/fcl/go32v2/Makefile b/fcl/go32v2/Makefile index cbd00351e1..17777f107e 100644 --- a/fcl/go32v2/Makefile +++ b/fcl/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -230,11 +231,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -290,7 +294,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -761,14 +765,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1054,7 +1054,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1062,7 +1062,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/fcl/linux/Makefile b/fcl/linux/Makefile index 7dabbae065..ba2ef08f90 100644 --- a/fcl/linux/Makefile +++ b/fcl/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -230,11 +231,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -290,7 +294,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -761,14 +765,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1054,7 +1054,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1062,7 +1062,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/fcl/os2/Makefile b/fcl/os2/Makefile index 39951b40b7..009cb97691 100644 --- a/fcl/os2/Makefile +++ b/fcl/os2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -230,11 +231,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -290,7 +294,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -761,14 +765,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1054,7 +1054,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1062,7 +1062,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/fcl/shedit/gtk/Makefile b/fcl/shedit/gtk/Makefile index 9a48ba9dd5..cbb4859b77 100644 --- a/fcl/shedit/gtk/Makefile +++ b/fcl/shedit/gtk/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -749,14 +753,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1057,7 +1057,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1065,7 +1065,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/fcl/tests/Makefile b/fcl/tests/Makefile index 563329b942..74f16485ed 100644 --- a/fcl/tests/Makefile +++ b/fcl/tests/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -212,11 +213,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -272,7 +276,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -802,14 +806,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1104,7 +1104,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1112,7 +1112,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/fcl/win32/Makefile b/fcl/win32/Makefile index fbbf819be7..fdec5d8cd2 100644 --- a/fcl/win32/Makefile +++ b/fcl/win32/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -230,11 +231,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -290,7 +294,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -761,14 +765,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1054,7 +1054,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1062,7 +1062,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/ide/Makefile b/ide/Makefile index 79a603546b..974f608332 100644 --- a/ide/Makefile +++ b/ide/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET diff --git a/ide/fake/Makefile b/ide/fake/Makefile index b46a63fea4..d256cdce16 100644 --- a/ide/fake/Makefile +++ b/ide/fake/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET diff --git a/ide/fake/compiler/Makefile b/ide/fake/compiler/Makefile index 6db14e9b21..991f90803c 100644 --- a/ide/fake/compiler/Makefile +++ b/ide/fake/compiler/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -193,11 +194,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -253,7 +257,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -680,14 +684,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -973,7 +973,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -981,7 +981,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/ide/fake/gdb/Makefile b/ide/fake/gdb/Makefile index 50dc66914d..e171101aba 100644 --- a/ide/fake/gdb/Makefile +++ b/ide/fake/gdb/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -193,11 +194,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -253,7 +257,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -680,14 +684,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -973,7 +973,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -981,7 +981,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/ide/text/Makefile b/ide/text/Makefile index f331c3d40b..1678039978 100644 --- a/ide/text/Makefile +++ b/ide/text/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -242,11 +243,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -302,7 +306,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -844,14 +848,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1134,7 +1134,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1142,7 +1142,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/install/Makefile b/install/Makefile index 2014187dfa..90d9f44785 100644 --- a/install/Makefile +++ b/install/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: help @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -229,11 +230,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -289,7 +293,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -685,14 +689,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -958,7 +958,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -966,7 +966,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Local Makefile diff --git a/install/Makefile.fpc b/install/Makefile.fpc index 5d5346ceec..5cf4859e07 100644 --- a/install/Makefile.fpc +++ b/install/Makefile.fpc @@ -1,5 +1,5 @@ # -# Makefile.fpc for Free Component Library +# Makefile.fpc for Release-files creation # [defaults] @@ -121,7 +121,7 @@ clean: build: build-stamp build-stamp: $(FPCDIRSET) # create new compiler - -$(MAKE) -C $(CVSBASE) compiler_cycle + $(MAKE) -C $(CVSBASE) compiler_cycle # clean $(MAKE) -C $(CVSBASE) rtl_clean $(MAKE) -C $(CVSBASE) api_clean diff --git a/install/demo/Makefile b/install/demo/Makefile index ce36d7ad2c..8824f30db2 100644 --- a/install/demo/Makefile +++ b/install/demo/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: both @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -224,11 +225,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -284,7 +288,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -746,14 +750,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1052,7 +1052,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1060,7 +1060,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/install/fpinst/Makefile b/install/fpinst/Makefile index cf11aeea59..ee925c61f4 100644 --- a/install/fpinst/Makefile +++ b/install/fpinst/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -209,11 +210,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -269,7 +273,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -761,14 +765,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1055,7 +1055,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1063,7 +1063,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/Makefile b/packages/Makefile index 1b40d3c9f7..132b493d9a 100644 --- a/packages/Makefile +++ b/packages/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -182,11 +183,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -242,7 +246,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools diff --git a/packages/forms/Makefile b/packages/forms/Makefile index 3ea74a4a7d..217478659e 100644 --- a/packages/forms/Makefile +++ b/packages/forms/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -719,14 +723,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1027,7 +1027,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1035,7 +1035,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/forms/demo/Makefile b/packages/forms/demo/Makefile index 20e4d9cd24..cc5c7a8274 100644 --- a/packages/forms/demo/Makefile +++ b/packages/forms/demo/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -762,14 +766,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1056,7 +1056,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1064,7 +1064,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index 61b8cb6fbd..3109259d7c 100644 --- a/packages/gdbint/Makefile +++ b/packages/gdbint/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -208,11 +209,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -268,7 +272,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -721,14 +725,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1031,7 +1031,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1039,7 +1039,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/gdbint/libgdb/Makefile b/packages/gdbint/libgdb/Makefile index 48cfc4a9a0..48acd50b8d 100644 --- a/packages/gdbint/libgdb/Makefile +++ b/packages/gdbint/libgdb/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile index 0fe38197aa..242f13f93f 100644 --- a/packages/ggi/Makefile +++ b/packages/ggi/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/gtk/Makefile b/packages/gtk/Makefile index 4512fa13db..f1f71ad08c 100644 --- a/packages/gtk/Makefile +++ b/packages/gtk/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -206,11 +207,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -266,7 +270,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -698,14 +702,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -989,7 +989,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -997,7 +997,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/gtk/examples/Makefile b/packages/gtk/examples/Makefile index 2d1803fa8c..a9d6c5de3e 100644 --- a/packages/gtk/examples/Makefile +++ b/packages/gtk/examples/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -208,11 +209,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -268,7 +272,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -726,14 +730,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1020,7 +1020,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1028,7 +1028,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/gtk/tutorial/Makefile b/packages/gtk/tutorial/Makefile index c41eb7aa92..01a55375ad 100644 --- a/packages/gtk/tutorial/Makefile +++ b/packages/gtk/tutorial/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -207,11 +208,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -267,7 +271,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -725,14 +729,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1019,7 +1019,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1027,7 +1027,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile index fcd326730f..c146034e8f 100644 --- a/packages/ibase/Makefile +++ b/packages/ibase/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/inet/Makefile b/packages/inet/Makefile index 047e163291..ce8955dec8 100644 --- a/packages/inet/Makefile +++ b/packages/inet/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile index 46f8824555..90f8c0e2bf 100644 --- a/packages/mysql/Makefile +++ b/packages/mysql/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index 71e436f5b6..939c270297 100644 --- a/packages/ncurses/Makefile +++ b/packages/ncurses/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile index a01ed3972a..0420f44b92 100644 --- a/packages/opengl/Makefile +++ b/packages/opengl/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET diff --git a/packages/opengl/build/Makefile b/packages/opengl/build/Makefile index 747b1a14da..6cdbf78b19 100644 --- a/packages/opengl/build/Makefile +++ b/packages/opengl/build/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -719,14 +723,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1027,7 +1027,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1035,7 +1035,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/opengl/examples/Makefile b/packages/opengl/examples/Makefile index b3a9f985bf..8e5820991c 100644 --- a/packages/opengl/examples/Makefile +++ b/packages/opengl/examples/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -762,14 +766,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1056,7 +1056,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1064,7 +1064,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/opengl/linux/Makefile b/packages/opengl/linux/Makefile index 1d9d1749a2..ab58789577 100644 --- a/packages/opengl/linux/Makefile +++ b/packages/opengl/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -89,6 +89,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -207,11 +208,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -267,7 +271,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -724,14 +728,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1017,7 +1017,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1025,7 +1025,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile index 9bdfc7b229..8d78f7529b 100644 --- a/packages/paszlib/Makefile +++ b/packages/paszlib/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -203,11 +204,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -263,7 +267,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -690,14 +694,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1002,7 +1002,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1010,7 +1010,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile index 6cd2289bc1..65d7c3f485 100644 --- a/packages/postgres/Makefile +++ b/packages/postgres/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index f78905f565..ad3259d9cd 100644 --- a/packages/svgalib/Makefile +++ b/packages/svgalib/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/uncgi/Makefile b/packages/uncgi/Makefile index 97f3356d01..f6b83e22ca 100644 --- a/packages/uncgi/Makefile +++ b/packages/uncgi/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile index ddb7fd4077..3f37420ffd 100644 --- a/packages/utmp/Makefile +++ b/packages/utmp/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1001,7 +1001,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1009,7 +1009,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/x11/Makefile b/packages/x11/Makefile index 676da81542..bfb6ce0f92 100644 --- a/packages/x11/Makefile +++ b/packages/x11/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -201,11 +202,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -261,7 +265,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -688,14 +692,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -981,7 +981,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -989,7 +989,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile index 174d755a69..d5ba23bd20 100644 --- a/packages/zlib/Makefile +++ b/packages/zlib/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -201,11 +202,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -261,7 +265,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -688,14 +692,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -981,7 +981,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -989,7 +989,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/rtl/Makefile b/rtl/Makefile index 183ac07a6a..c9c62600cf 100644 --- a/rtl/Makefile +++ b/rtl/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -174,11 +175,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -234,7 +238,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools diff --git a/rtl/go32v1/Makefile b/rtl/go32v1/Makefile index 023821bde8..76fb3eec36 100644 --- a/rtl/go32v1/Makefile +++ b/rtl/go32v1/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -90,6 +90,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -235,11 +236,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -295,7 +299,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -679,14 +683,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1000,7 +1000,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1008,7 +1008,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 3092e12f87..a8fc110ed1 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -90,6 +90,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -235,11 +236,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -295,7 +299,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -679,14 +683,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1000,7 +1000,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1008,7 +1008,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 1a8d1789c2..e1d916059f 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -90,6 +90,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -246,11 +247,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -306,7 +310,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -690,14 +694,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1011,7 +1011,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1019,7 +1019,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index e811b5fae0..d3960e75e7 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -90,6 +90,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -235,11 +236,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -295,7 +299,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -679,14 +683,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1000,7 +1000,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1008,7 +1008,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 95b0d117b3..5bf6675b7e 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -90,6 +90,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -240,11 +241,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -300,7 +304,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -684,14 +688,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1005,7 +1005,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1013,7 +1013,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/tests/Makefile b/tests/Makefile index ce1fd44870..4248ff7073 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: info @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET diff --git a/utils/Makefile b/utils/Makefile index f9f2bd46d1..a6be234921 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -219,11 +220,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -279,7 +283,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -822,14 +826,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1122,7 +1122,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1130,7 +1130,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile index ec784120a6..dfee4c71ff 100644 --- a/utils/fprcp/Makefile +++ b/utils/fprcp/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -983,7 +983,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -991,7 +991,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile index 554f41dad2..71bc09bad7 100644 --- a/utils/h2pas/Makefile +++ b/utils/h2pas/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -203,11 +204,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -263,7 +267,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -694,14 +698,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -988,7 +988,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -996,7 +996,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/utils/simulator/Makefile b/utils/simulator/Makefile index c0afef0cbd..b4f011c7b7 100644 --- a/utils/simulator/Makefile +++ b/utils/simulator/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -202,11 +203,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -262,7 +266,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -689,14 +693,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -983,7 +983,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -991,7 +991,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules diff --git a/utils/tply/Makefile b/utils/tply/Makefile index e3f6010ab7..69e93d1573 100644 --- a/utils/tply/Makefile +++ b/utils/tply/Makefile @@ -1,5 +1,5 @@ # -# Makefile generated by fpcmake v0.99.13 [2000/01/14] +# Makefile generated by fpcmake v0.99.13 [2000/01/16] # defaultrule: all @@ -83,6 +83,7 @@ FPC=ppc386$(EXEEXT) endif endif endif +override FPC:=$(subst \,/,$(FPC)) # Target OS ifndef OS_TARGET @@ -215,11 +216,14 @@ ifeq ($(ECHO),) ECHO:=$(strip $(wildcard $(addsuffix /echo$(EXEEXT),$(SEARCHPATH)))) ifeq ($(ECHO),) ECHO:=echo +ECHOE:=echo else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif else ECHO:=$(firstword $(ECHO)) +ECHOE=$(ECHO) -E endif endif @@ -275,7 +279,7 @@ MKDIR:=ginstall -m 755 -d endif endif -export ECHO COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR +export ECHO ECHOE COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR ##################################################################### # Default Tools @@ -706,14 +710,10 @@ ifdef CFGFILE override FPCOPT+=@$(CFGFILE) endif -# For win32 the options are passed using the file fpcext.cmd -ifndef FPCEXTCMD -FPCEXTCMD=fpcext.cmd -endif +# For win32 the options are passed using the environment FPCEXTCMD ifeq ($(OS_SOURCE),win32) -override TMPVAR:=$(shell "$(DEL) $(FPCEXTCMD)") -override TMPVAR:=$(foreach A,$(FPCOPT),$(shell "$(ECHO) $(A) >> $(FPCEXTCMD)")) -override FPCOPT:=@$(FPCEXTCMD) +override FPCEXTCMD:=$(FPCOPT) +override FPCOPT:=!FPCEXTCMD endif # Compiler commandline @@ -1014,7 +1014,7 @@ endif ifdef EXTRACLEANFILES -$(DEL) $(EXTRACLEANFILES) endif - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES @@ -1022,7 +1022,7 @@ ifdef CLEANEXEFILES endif -$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT) -$(DELTREE) *$(SMARTEXT) - -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTCMD) $(REDIRFILE) + -$(DEL) $(FPCMADE) $(PPAS) link.res $(FPCEXTFILE) $(REDIRFILE) ##################################################################### # Info rules