* use env var again for win32

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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