* asw support

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -356,7 +362,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -621,30 +627,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1008,7 +1031,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -343,7 +349,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -608,30 +614,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -995,7 +1018,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -286,7 +292,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -551,30 +557,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -959,7 +982,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -130,8 +130,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -287,7 +293,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -552,30 +558,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -884,7 +907,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -966,7 +989,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -548,30 +554,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -956,7 +979,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -548,30 +554,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -956,7 +979,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -548,30 +554,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -956,7 +979,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -281,7 +287,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -546,30 +552,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -954,7 +977,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -548,30 +554,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -956,7 +979,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -312,7 +318,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -591,30 +597,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1221,7 +1244,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -296,7 +302,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -575,30 +581,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1060,7 +1083,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -286,7 +292,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -551,30 +557,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -970,7 +993,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -286,7 +292,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -565,30 +571,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1026,7 +1049,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -286,7 +292,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -565,30 +571,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1026,7 +1049,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -562,30 +568,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1138,7 +1161,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -286,7 +292,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -551,30 +557,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -970,7 +993,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -562,30 +568,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1248,7 +1271,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -289,7 +295,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -568,30 +574,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1144,7 +1167,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -954,7 +977,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fv/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -288,7 +294,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -553,30 +559,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1051,7 +1074,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fv/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -281,7 +287,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -546,30 +552,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -990,7 +1013,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fvision/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -288,7 +294,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -553,30 +559,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1051,7 +1074,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

fvision/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -281,7 +287,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -546,30 +552,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -990,7 +1013,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -335,7 +341,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -614,30 +620,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1215,7 +1238,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

ide/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -296,7 +302,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -561,30 +567,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -965,7 +988,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

ide/fakegdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -282,7 +288,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -547,30 +553,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -951,7 +974,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

install/fpinst/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -303,7 +309,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -568,30 +574,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1091,7 +1114,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -302,7 +308,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -567,30 +573,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -820,7 +843,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1048,7 +1071,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -286,7 +292,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -565,30 +571,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1117,7 +1140,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -282,7 +288,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -561,30 +567,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1047,7 +1070,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -287,7 +293,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -566,30 +572,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1070,7 +1093,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -130,8 +130,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -272,7 +278,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -537,30 +543,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -790,7 +813,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -130,8 +130,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -273,7 +279,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -538,30 +544,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -791,7 +814,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -288,7 +294,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -567,30 +573,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1137,7 +1160,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -284,7 +290,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -563,30 +569,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1079,7 +1102,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -281,7 +287,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -560,30 +566,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -940,7 +963,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1055,7 +1078,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1048,7 +1071,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -284,7 +290,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -563,30 +569,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1088,7 +1111,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/mmsystem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -284,7 +290,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -549,30 +555,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1032,7 +1055,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -308,7 +314,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -587,30 +593,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1121,7 +1144,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/opengl/build/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all_units
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -562,30 +568,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1146,7 +1169,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -282,7 +288,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -561,30 +567,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1041,7 +1064,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -562,30 +568,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1185,7 +1208,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1048,7 +1071,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -286,7 +292,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -551,30 +557,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1049,7 +1072,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -564,30 +570,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1068,7 +1091,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1048,7 +1071,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/unzip/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -287,7 +293,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -552,30 +558,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1035,7 +1058,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1048,7 +1071,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -284,7 +290,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -563,30 +569,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1052,7 +1075,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

packages/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -284,7 +290,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -563,30 +569,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1052,7 +1075,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -305,7 +311,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -570,30 +576,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -965,7 +988,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/amiga/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -140,8 +140,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -305,7 +311,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -570,30 +576,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -934,7 +957,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/beos/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -140,8 +140,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -300,7 +306,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -565,30 +571,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -929,7 +952,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/freebsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -139,8 +139,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -312,7 +318,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -577,30 +583,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -941,7 +964,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -140,8 +140,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -298,7 +304,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -563,30 +569,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -927,7 +950,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -140,8 +140,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -305,7 +311,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -570,30 +576,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -934,7 +957,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -139,8 +139,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -318,7 +324,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -583,30 +589,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -947,7 +970,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -140,8 +140,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -304,7 +310,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -569,30 +575,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -933,7 +956,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -139,8 +139,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -308,7 +314,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -573,30 +579,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -937,7 +960,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)
@@ -1010,7 +1037,6 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
 include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-override AS=asw
 wprt0$(OEXT) : $(PRT0).as
 	$(AS) -o wprt0$(OEXT) $(PRT0).as
 wdllprt0$(OEXT) : wdllprt0.as

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: allexectests
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -281,7 +287,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -546,30 +552,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -799,7 +822,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -282,7 +288,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -547,30 +553,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -951,7 +974,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -286,7 +292,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -565,30 +571,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1220,7 +1243,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

utils/dxegen/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -958,7 +981,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

utils/fpcm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -284,7 +290,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -563,30 +569,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -1139,7 +1162,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

utils/fpcm/fpcmake.ini

@@ -207,9 +207,19 @@ endif
 endif
 endif
 
+# Cross compiler dir
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+
+# Cross target dir
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
+
 # Units dir, when cross compiling try first the
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -466,7 +476,7 @@ ifdef CROSSCOMPILE
 # First check if they are available in FPCDIR. If no targets/ subdir
 # is found use the targets/ subdir in INSTALL_BASEDIR.
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -648,30 +658,50 @@ endif
 # Default Tools
 #####################################################################
 
+# Names of the binutils tools
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
+
 # assembler, redefine it if cross compiling
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 
 # linker, but probably not used
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 
 # Resource compiler
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+
+# Archiver
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 
@@ -679,6 +709,7 @@ endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 
 # ppas.bat / ppas.sh
 PPAS=ppas$(BATCHEXT)
@@ -1372,7 +1403,11 @@ fpc_info:
         @$(ECHO)
         @$(ECHO)  == Tools info ==
         @$(ECHO)
-        @$(ECHO)  Pwd....... $(PWD)
+        @$(ECHO)  As........ $(AS)
+        @$(ECHO)  Ld........ $(LD)
+        @$(ECHO)  Ar........ $(AR)
+        @$(ECHO)  Rc........ $(RC)
+        @$(ECHO)  
         @$(ECHO)  Mv........ $(MVPROG)
         @$(ECHO)  Cp........ $(CPPROG)
         @$(ECHO)  Rm........ $(RMPROG)

utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -548,30 +554,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -956,7 +979,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -284,7 +290,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -549,30 +555,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -957,7 +980,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -283,7 +289,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -548,30 +554,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -956,7 +979,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)

utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/16]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2001/10/18]
 #
 default: all
 override PATH:=$(subst \,/,$(PATH))
@@ -138,8 +138,14 @@ endif
 endif
 endif
 endif
+ifndef CROSSDIR
+CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
+endif
+ifndef CROSSTARGETDIR
+CROSSTARGETDIR=$(CROSSDIR)/$(FULL_TARGET)
+endif
 ifdef CROSSCOMPILE
-UNITSDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/units)
+UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)
 ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
@@ -285,7 +291,7 @@ INSTALL_DATADIR=$(INSTALL_BASEDIR)
 endif
 ifdef CROSSCOMPILE
 ifndef CROSSBINDIR
-CROSSBINDIR:=$(wildcard $(FPCDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
+CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))
 ifeq ($(CROSSBINDIR),)
 CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$(FULL_SOURCE))
 endif
@@ -550,30 +556,47 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
+ASNAME=as
+LDNAME=ld
+ARNAME=ar
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
+endif
 ifndef ASPROG
 ifdef CROSSBINDIR
-ASPROG=$(CROSSBINDIR)/as$(SRCEXEEXT)
+ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)
 else
-ASPROG=as
+ASPROG=$(ASNAME)
 endif
 endif
 ifndef LDPROG
 ifdef CROSSBINDIR
-LDPROG=$(CROSSBINDIR)/ld$(SRCEXEEXT)
+LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEXT)
 else
-LDPROG=ld
+LDPROG=$(LDNAME)
 endif
 endif
 ifndef RCPROG
 ifdef CROSSBINDIR
-RCPROG=$(CROSSBINDIR)/rc$(SRCEXEEXT)
+RCPROG=$(CROSSBINDIR)/$(RCNAME)$(SRCEXEEXT)
+else
+RCPROG=$(RCNAME)
+endif
+endif
+ifndef ARPROG
+ifdef CROSSBINDIR
+ARPROG=$(CROSSBINDIR)/$(ARNAME)$(SRCEXEEXT)
 else
-RCPROG=rc
+ARPROG=$(ARNAME)
 endif
 endif
 AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
+AR=$(ARPROG)
 PPAS=ppas$(BATCHEXT)
 ifdef inUnix
 LDCONFIG=ldconfig
@@ -966,7 +989,11 @@ fpc_info:
 	@$(ECHO)
 	@$(ECHO)  == Tools info ==
 	@$(ECHO)
-	@$(ECHO)  Pwd....... $(PWD)
+	@$(ECHO)  As........ $(AS)
+	@$(ECHO)  Ld........ $(LD)
+	@$(ECHO)  Ar........ $(AR)
+	@$(ECHO)  Rc........ $(RC)
+	@$(ECHO)  
 	@$(ECHO)  Mv........ $(MVPROG)
 	@$(ECHO)  Cp........ $(CPPROG)
 	@$(ECHO)  Rm........ $(RMPROG)