* regenated

Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/18]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: help
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=.
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -330,6 +347,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -391,9 +409,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -517,11 +535,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -1047,8 +1067,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)
@@ -1625,21 +1645,27 @@ docsrc:
 demozip:
 	$(MAKE) -C demo zipsourceinstall ZIPNAME=demo
 .PHONY: sourcebase sourcezip
+INSTALL_BASESOURCEDIR=$(INSTALL_SOURCEDIR)/..
 sourcebase:
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(MKDIR) $(INSTALL_SOURCEDIR)/rtl
-	$(MKDIR) $(INSTALL_SOURCEDIR)/packages
-	$(COPY) Makefile*  $(INSTALL_SOURCEDIR)
-	$(COPY) rtl/Makefile* $(INSTALL_SOURCEDIR)/rtl
-	$(COPY) packages/Makefile* $(INSTALL_SOURCEDIR)/packages
-sourcezip: distclean
+	$(MKDIR) $(INSTALL_BASESOURCEDIR)
+	$(MKDIR) $(INSTALL_BASESOURCEDIR)/rtl
+	$(MKDIR) $(INSTALL_BASESOURCEDIR)/packages
+	$(MKDIR) $(INSTALL_BASESOURCEDIR)/packages/base
+	$(MKDIR) $(INSTALL_BASESOURCEDIR)/packages/extra
+	$(COPY) Makefile*  $(INSTALL_BASESOURCEDIR)
+	$(COPY) rtl/Makefile* $(INSTALL_BASESOURCEDIR)/rtl
+	$(COPY) packages/Makefile* $(INSTALL_BASESOURCEDIR)/packages
+	$(COPY) packages/base/Makefile* $(INSTALL_BASESOURCEDIR)/packages/base
+	$(COPY) packages/extra/Makefile* $(INSTALL_BASESOURCEDIR)/packages/extra
+sourcezip:
 	$(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
 	$(MAKE) compiler_zipsourceinstall
 	$(MAKE) rtl_zipsourceinstall
-	$(MAKE) packages_zipsourceinstall
+	$(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGPRE)
 	$(MAKE) fcl_zipsourceinstall
 	$(MAKE) utils_zipsourceinstall
 	$(MAKE) ide_zipsourceinstall
+	$(MAKE) installer_zipsourceinstall
 .PHONY: go32v2 win32 linux freebsd os2 go32v2zip win32zip linuxzip freebsdzip os2zip
 go32v2: checkfpcdir
 	$(MAKE) install OS_TARGET=go32v2
@@ -1651,7 +1677,7 @@ freebsd: checkfpcdir
 	$(MAKE) install OS_TARGET=freebsd
 os2: checkfpcdir
 	$(MAKE) install OS_TARGET=os2
-sunos: checkfpcdir        
+sunos: checkfpcdir
 	$(MAKE) install OS_TARGET=sunos
 go32v2zip: checkfpcdir
 	$(MAKE) zipinstall OS_TARGET=go32v2
@@ -1665,8 +1691,23 @@ beoszip : checkfpcdir
 	$(MAKE) zipinstall OS_TARGET=beos USEZIP=1
 os2zip: checkfpcdir
 	$(MAKE) zipinstall OS_TARGET=os2
-sunoszip: checkfpcdir        
-	$(MAKE) install OS_TARGET=sunos TARPROG=gtar
+sunoszip: checkfpcdir
+	$(MAKE) zipinstall OS_TARGET=sunos TARPROG=gtar
+.PHONY: renametoshort shortsrc shortbin shortnames
+renametoshort:
+	-mv compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIX).zip
+	-mv utils$(ZIPSUFFIX).zip util$(ZIPSUFFIX).zip
+	-mv installer$(ZIPSUFFIX).zip inst$(ZIPSUFFIX).zip
+	-mv ugdbint$(ZIPSUFFIX).zip ugdb$(ZIPSUFFIX).zip
+	-mv uregexpr$(ZIPSUFFIX).zip ureg$(ZIPSUFFIX).zip
+	-mv upaszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIX).zip
+	-mv uuncgi$(ZIPSUFFIX).zip ucgi$(ZIPSUFFIX).zip
+	-mv uunzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIX).zip
+shortsrc:
+	$(MAKE) renametoshort ZIPSUFFIX=src
+shortbin:
+	$(MAKE) renametoshort
+shortnames: shortsrc shortbin
 ifdef inUnix
 ifneq ($(wildcard $(CVSINSTALL)/debian/changelog),)
 .PHONY: debcopy deb

Makefile.fpc

@@ -359,25 +359,31 @@ demozip:
 
 .PHONY: sourcebase sourcezip
 
+# We don't want the fpc/ package prefix
+INSTALL_BASESOURCEDIR=$(INSTALL_SOURCEDIR)/..
+
 sourcebase:
 # base Makefiles needed for sources
-        $(MKDIR) $(INSTALL_SOURCEDIR)
-        $(MKDIR) $(INSTALL_SOURCEDIR)/rtl
-        $(MKDIR) $(INSTALL_SOURCEDIR)/packages
-        $(COPY) Makefile*  $(INSTALL_SOURCEDIR)
-        $(COPY) rtl/Makefile* $(INSTALL_SOURCEDIR)/rtl
-        $(COPY) packages/Makefile* $(INSTALL_SOURCEDIR)/packages
-
-sourcezip: distclean
+        $(MKDIR) $(INSTALL_BASESOURCEDIR)
+        $(MKDIR) $(INSTALL_BASESOURCEDIR)/rtl
+        $(MKDIR) $(INSTALL_BASESOURCEDIR)/packages
+        $(MKDIR) $(INSTALL_BASESOURCEDIR)/packages/base
+        $(MKDIR) $(INSTALL_BASESOURCEDIR)/packages/extra
+        $(COPY) Makefile*  $(INSTALL_BASESOURCEDIR)
+        $(COPY) rtl/Makefile* $(INSTALL_BASESOURCEDIR)/rtl
+        $(COPY) packages/Makefile* $(INSTALL_BASESOURCEDIR)/packages
+        $(COPY) packages/base/Makefile* $(INSTALL_BASESOURCEDIR)/packages/base
+        $(COPY) packages/extra/Makefile* $(INSTALL_BASESOURCEDIR)/packages/extra
+
+sourcezip:
         $(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
         $(MAKE) compiler_zipsourceinstall
         $(MAKE) rtl_zipsourceinstall
-        $(MAKE) packages_zipsourceinstall
+        $(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGPRE)
         $(MAKE) fcl_zipsourceinstall
         $(MAKE) utils_zipsourceinstall
         $(MAKE) ide_zipsourceinstall
-#        $(MAKE) installersrc
-#        $(MAKE) docsrc
+        $(MAKE) installer_zipsourceinstall
 
 
 ##########################################################################
@@ -400,8 +406,8 @@ freebsd: checkfpcdir
 
 os2: checkfpcdir
         $(MAKE) install OS_TARGET=os2
-        
-sunos: checkfpcdir        
+
+sunos: checkfpcdir
         $(MAKE) install OS_TARGET=sunos
 
 go32v2zip: checkfpcdir
@@ -422,10 +428,35 @@ beoszip : checkfpcdir
 
 os2zip: checkfpcdir
         $(MAKE) zipinstall OS_TARGET=os2
-        
-sunoszip: checkfpcdir        
+
+sunoszip: checkfpcdir
         $(MAKE) zipinstall OS_TARGET=sunos TARPROG=gtar
-        
+
+##########################################################################
+# Dos, OS/2 Short 8.3 Names
+##########################################################################
+
+.PHONY: renametoshort shortsrc shortbin shortnames
+
+renametoshort:
+# Compiler parts
+        -mv compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIX).zip
+        -mv utils$(ZIPSUFFIX).zip util$(ZIPSUFFIX).zip
+        -mv installer$(ZIPSUFFIX).zip inst$(ZIPSUFFIX).zip
+# Packages
+        -mv ugdbint$(ZIPSUFFIX).zip ugdb$(ZIPSUFFIX).zip
+        -mv uregexpr$(ZIPSUFFIX).zip ureg$(ZIPSUFFIX).zip
+        -mv upaszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIX).zip
+        -mv uuncgi$(ZIPSUFFIX).zip ucgi$(ZIPSUFFIX).zip
+        -mv uunzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIX).zip
+
+shortsrc:
+        $(MAKE) renametoshort ZIPSUFFIX=src
+
+shortbin:
+        $(MAKE) renametoshort
+
+shortnames: shortsrc shortbin
 
 ##########################################################################
 # Debian

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -179,7 +196,7 @@ else
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override PACKAGE_NAME=fpcompiler
+override PACKAGE_NAME=compiler
 override PACKAGE_VERSION=1.1
 unexport FPC_VERSION
 ifdef ALPHA
@@ -305,6 +322,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -366,9 +384,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -492,11 +510,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -810,6 +830,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -1077,8 +1102,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

compiler/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [package]
-name=fpcompiler
+name=compiler
 version=1.1
 
 [target]

compiler/msgidx.inc

@@ -604,7 +604,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 33810;
+  MsgTxtSize = 33809;
 
   MsgIdxMax : array[1..20] of longint=(
     17,62,184,38,41,41,98,17,35,42,

compiler/msgtxt.inc

@@ -264,323 +264,323 @@ const msgtxt : array[0..000140,1..240] of char=(
   '03151_E_Data types which require initialization/finalization can'#039't'+
   ' be used in variant records'#000+
   '03152_E_Resourcestrings can be only static or global'#000+
-  '03153_E_Exit with a','rgument can'#039't be used here'#000+
+  '03153_E_Exit with ar','gument can'#039't be used here'#000+
   '03154_E_The type of the storage symbol must be boolean'#000+
   '03155_E_This symbol isn'#039't allowed as storage symbol'#000+
   '03156_E_Only class which are compiled in $M+ mode can be published'#000+
   '03157_E_Procedure directive expected'#000+
-  '03','158_E_The value for a property index must be of an ordinal type'#000+
+  '031','58_E_The value for a property index must be of an ordinal type'#000+
   '03159_E_Procedure name to short to be exported'#000+
   '03160_E_No DEFFILE entry can be generated for unit global vars'#000+
   '03161_E_Compile without -WD option'#000+
-  '03162_F_You need ObjFpc (-S2) o','r Delphi (-Sd) mode to compile this m'+
+  '03162_F_You need ObjFpc (-S2) or',' Delphi (-Sd) mode to compile this m'+
   'odule'#000+
   '03163_E_Can'#039't export with index under $1'#000+
   '03164_E_Exporting of variables is not supported under $1'#000+
   '03165_E_Improper GUID syntax'#000+
   '03166_F_An interface can'#039't have variables'#000+
-  '03167_F_An interface can'#039't h','ave constructor or destructor'#000+
+  '03167_F_An interface can'#039't ha','ve constructor or destructor'#000+
   '03168_W_Procedure named "$1" not found that is suitable for implementi'+
   'ng the $2.$3'#000+
   '03169_E_interface identifier expected'#000+
   '03170_E_Type "$1" can'#039't be used as array index type'#000+
-  '03171_E_Con- and destructors aren'#039't a','llowed in interfaces'#000+
+  '03171_E_Con- and destructors aren'#039't al','lowed in interfaces'#000+
   '03172_E_Access specifiers can'#039't be used in INTERFACES'#000+
   '03173_E_An interface can'#039't contain fields'#000+
   '03174_E_Can'#039't declare local procedure as EXTERNAL'#000+
   '03175_W_Some fields coming before "$1" weren'#039't initialized'#000+
-  '03176_E_Some f','ields coming before "$1" weren'#039't initialized'#000+
+  '03176_E_Some fi','elds coming before "$1" weren'#039't initialized'#000+
   '03177_H_Some fields coming after "$1" weren'#039't initialized'#000+
   '03178_E_VarArgs directive without CDecl and External'#000+
   '03179_E_Self must be a normal (call-by-value) parameter'#000+
-  '03180_E_Interface "$1" has n','o interface identification'#000+
+  '03180_E_Interface "$1" has no',' interface identification'#000+
   '03181_E_Unknown class field or method identifier "$1"'#000+
   '03182_W_Overriding calling convention "$1" with "$2"'#000+
   '03183_E_Typed constants of the type "procedure of object" can only be '+
   'initialized with NIL'#000+
-  '04000_E_Type mi','smatch'#000+
+  '04000_E_Type mis','match'#000+
   '04001_E_Incompatible types: got "$1" expected "$2"'#000+
   '04002_E_Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
   '04004_E_Variable identifier expected'#000+
   '04005_E_Integer expression expected, but got "$1"'#000+
-  '04006_E_Boolean ex','pression expected, but got "$1"'#000+
+  '04006_E_Boolean exp','ression expected, but got "$1"'#000+
   '04007_E_Ordinal expression expected'#000+
   '04008_E_pointer type expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
   '04010_E_Variable or type indentifier expected'#000+
-  '04011_E_Can'#039't evaluate constant expressi','on'#000+
+  '04011_E_Can'#039't evaluate constant expressio','n'#000+
   '04012_E_Set elements are not compatible'#000+
   '04013_E_Operation not implemented for sets'#000+
   '04014_W_Automatic type conversion from floating type to COMP which is '+
   'an integer type'#000+
   '04015_H_use DIV instead to get an integer result'#000+
-  '04016_E_string type','s doesn'#039't match, because of $V+ mode'#000+
+  '04016_E_string types',' doesn'#039't match, because of $V+ mode'#000+
   '04017_E_succ or pred on enums with assignments not possible'#000+
   '04018_E_Can'#039't read or write variables of this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
-  '04020_E_Can'#039't use read or write on untyped',' file.'#000+
+  '04020_E_Can'#039't use read or write on untyped ','file.'#000+
   '04021_E_Type conflict between set elements'#000+
   '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
   '04023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
-  '04025_E_Incompatible type for arg no. $','1: Got "$2", expected "$3"'#000+
+  '04025_E_Incompatible type for arg no. $1',': Got "$2", expected "$3"'#000+
   '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
   '04027_E_Illegal constant passed to internal math function'#000+
   '04028_E_Can'#039't get the address of constants'#000+
   '04029_E_Argument can'#039't be assigned to'#000+
-  '0403','0_E_Can'#039't assign local procedure/function to procedure varia'+
+  '04030','_E_Can'#039't assign local procedure/function to procedure varia'+
   'ble'#000+
   '04031_E_Can'#039't assign values to an address'#000+
   '04032_E_Can'#039't assign values to const variable'#000+
   '04033_E_Array type required'#000+
   '04034_E_interface type expected, but got "$1"'#000+
-  '04035_W_Mixing',' signed expressions and cardinals gives a 64bit result'+
+  '04035_W_Mixing ','signed expressions and cardinals gives a 64bit result'+
   #000+
   '04036_W_Mixing signed expressions and cardinals here may cause a range'+
   ' check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
   '05000_E_Identifier not found "$1"'#000+
-  '05001_F','_Internal Error in SymTableStack()'#000+
+  '05001_F_','Internal Error in SymTableStack()'#000+
   '05002_E_Duplicate identifier "$1"'#000+
   '05003_H_Identifier already defined in $1 at line $2'#000+
   '05004_E_Unknown identifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
-  '05006_F_Identifier type already defined as ','type'#000+
+  '05006_F_Identifier type already defined as t','ype'#000+
   '05007_E_Error in type definition'#000+
   '05008_E_Type identifier not defined'#000+
   '05009_E_Forward type not resolved "$1"'#000+
   '05010_E_Only static variables can be used in static methods or outside'+
   ' methods'#000+
   '05011_E_Invalid call to tvarsym.mangledname()'#000+
-  '05','012_F_record or class type expected'#000+
+  '050','12_F_record or class type expected'#000+
   '05013_E_Instances of classes or objects with an abstract method are no'+
   't allowed'#000+
   '05014_W_Label not defined "$1"'#000+
   '05015_E_Label used but not defined "$1"'#000+
   '05016_E_Illegal label declaration'#000+
-  '05017_E_GOTO and LA','BEL are not supported (use switch -Sg)'#000+
+  '05017_E_GOTO and LAB','EL are not supported (use switch -Sg)'#000+
   '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
   '05021_E_illegal type declaration of set elements'#000+
   '05022_E_Forward class definition not resolved "$1"'#000+
-  '05023_H_Unit "','$1" not used in $2'#000+
+  '05023_H_Unit "$','1" not used in $2'#000+
   '05024_H_Parameter "$1" not used'#000+
   '05025_N_Local variable "$1" not used'#000+
   '05026_H_Value parameter "$1" is assigned but never used'#000+
   '05027_N_Local variable "$1" is assigned but never used'#000+
   '05028_H_Local $1 "$2" is not used'#000+
-  '05029_N','_Private field "$1.$2" is never used'#000+
+  '05029_N_','Private field "$1.$2" is never used'#000+
   '05030_N_Private field "$1.$2" is assigned but never used'#000+
   '05031_N_Private method "$1.$2" never used'#000+
   '05032_E_Set type expected'#000+
   '05033_W_Function result does not seem to be set'#000+
-  '05034_W_Type "$1" is not align','ed correctly in current record for C'#000+
+  '05034_W_Type "$1" is not aligne','d correctly in current record for C'#000+
   '05035_E_Unknown record field identifier "$1"'#000+
   '05036_W_Local variable "$1" does not seem to be initialized'#000+
   '05037_W_Variable "$1" does not seem to be initialized'#000+
   '05038_E_identifier idents no member "$1"'#000+
-  '050','39_B_Found declaration: $1'#000+
+  '0503','9_B_Found declaration: $1'#000+
   '05040_E_Data segment too large (max. 2GB)'#000+
   '06000_E_BREAK not allowed'#000+
   '06001_E_CONTINUE not allowed'#000+
   '06002_E_Expression too complicated - FPU stack overflow'#000+
   '06003_E_Illegal expression'#000+
-  '06004_E_Invalid integer expressio','n'#000+
+  '06004_E_Invalid integer expression',#000+
   '06005_E_Illegal qualifier'#000+
   '06006_E_High range limit < low range limit'#000+
   '06007_E_Illegal counter variable'#000+
   '06008_E_Can'#039't determine which overloaded function to call'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
-  '06010_E_Illegal type conversio','n'#000+
+  '06010_E_Illegal type conversion',#000+
   '06011_D_Conversion between ordinals and pointers is not portable acros'+
   's platforms'#000+
   '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
   '06014_E_illegal call by reference parameters'#000+
-  '06015_E_EXPORT d','eclared functions can'#039't be called'#000+
+  '06015_E_EXPORT de','clared functions can'#039't be called'#000+
   '06016_W_Possible illegal call of constructor or destructor (doesn'#039't'+
   ' match to this context)'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
   '06019_E_procedure call with stackframe ESP/SP'#000+
-  '06020_E_Abstract me','thods can'#039't be called directly'#000+
+  '06020_E_Abstract met','hods can'#039't be called directly'#000+
   '06021_F_Internal Error in getfloatreg(), allocation failure'#000+
   '06022_F_Unknown float type'#000+
   '06023_F_SecondVecn() base defined twice'#000+
   '06024_F_Extended cg68k not supported'#000+
-  '06025_F_32-bit unsigned not supported in MC68','000 mode'#000+
+  '06025_F_32-bit unsigned not supported in MC680','00 mode'#000+
   '06026_F_Internal Error in secondinline()'#000+
   '06027_D_Register $1 weight $2 $3'#000+
   '06028_E_Stack limit excedeed in local routine'#000+
   '06029_D_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
-  '06032_E_Procvar calls can'#039't be ','inline.'#000+
+  '06032_E_Procvar calls can'#039't be i','nline.'#000+
   '06033_E_No code for inline procedure stored'#000+
   '06034_E_Direct call of interrupt procedure "$1" is not possible'#000+
   '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
   'sed, use (set)length instead'#000+
-  '06036_E_Include and exclude n','ot implemented in this case'#000+
+  '06036_E_Include and exclude no','t implemented in this case'#000+
   '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
   'th'#039' clause'#000+
   '06038_E_Cannot call message handler method directly'#000+
   '06039_E_Jump in or outside of an exception block'#000+
-  '06040_E_Control flow statements ar','en'#039't allowed in a finally bloc'+
+  '06040_E_Control flow statements are','n'#039't allowed in a finally bloc'+
   'k'#000+
   '07000_D_Starting $1 styled assembler parsing'#000+
   '07001_D_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07003_W_Override operator not supported'#000+
   '07004_E_Error building record offset'#000+
-  '0700','5_E_OFFSET used without identifier'#000+
+  '07005','_E_OFFSET used without identifier'#000+
   '07006_E_TYPE used without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
   '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
   '07010_E_Cannot use multiple relocatable symbols'#000+
-  '07011_E_','Relocatable symbol can only be added'#000+
+  '07011_E_R','elocatable symbol can only be added'#000+
   '07012_E_Invalid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
   '07014_E_Invalid reference syntax'#000+
   '07015_E_You can not reach $1 from that code'#000+
-  '07016_E_Local symbols/labels aren'#039't allowed as r','eferences'#000+
+  '07016_E_Local symbols/labels aren'#039't allowed as re','ferences'#000+
   '07017_E_Invalid base and index register usage'#000+
   '07018_W_Possible error in object field handling'#000+
   '07019_E_Wrong scale factor specified'#000+
   '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
-  '07022_E_Invalid string as opcode',' operand: $1'#000+
+  '07022_E_Invalid string as opcode ','operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
   '07024_E_Null label references are not allowed'#000+
   '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#000+
-  '07029_W','_Fwait can cause emulation problems with emu387'#000+
+  '07029_W_','Fwait can cause emulation problems with emu387'#000+
   '07030_W_$1 without operand translated into $1P'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
   '07032_W_Calling an overload function in assembler'#000+
-  '07033_E_Unsupported symbol type for ','operand'#000+
+  '07033_E_Unsupported symbol type for o','perand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
   '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
   '07039_H_$1 translated to $2'#000+
-  '07040_W_$1 is associat','ed to an overloaded function'#000+
+  '07040_W_$1 is associate','d to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
   '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
-  '07045_E_Size suffix and destination o','r source size do not match'#000+
+  '07045_E_Size suffix and destination or',' source size do not match'#000+
   '07046_W_Size suffix and destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
   '07048_E_Invalid combination of opcode and operands'#000+
   '07049_E_Assembler syntax error in operand'#000+
-  '07050_E_Assembler syntax ','error in constant'#000+
+  '07050_E_Assembler syntax e','rror in constant'#000+
   '07051_E_Invalid String expression'#000+
   '07052_W_constant with symbol $1 for not 32bit address'#000+
   '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
-  '07056_E_Invalid ','combination of override and opcode: $1'#000+
+  '07056_E_Invalid c','ombination of override and opcode: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
-  '07063_E_Invalid regist','er name'#000+
+  '07063_E_Invalid registe','r name'#000+
   '07064_E_Invalid floating point register name'#000+
   '07065_E_NOR not supported'#000+
   '07066_W_Modulo not supported'#000+
   '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
   '07069_E_Wrong symbol type'#000+
-  '07070_E_Cannot index ','a local var or parameter with a register'#000+
+  '07070_E_Cannot index a',' local var or parameter with a register'#000+
   '07071_E_Invalid segment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
   '07073_E_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
-  '07075_E_assembler code not returned to',' text section'#000+
+  '07075_E_assembler code not returned to ','text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
   '07077_E_Using a defined name as a local label'#000+
   '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
-  '07080_N_.align is target specific, use .bal','ign or .p2align'#000+
+  '07080_N_.align is target specific, use .bali','gn or .p2align'#000+
   '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
   '07083_E_No size specified and unable to determine the size of the oper'+
   'ands'#000+
-  '07084_E_Cannot use RESULT in this functio','n'#000+
+  '07084_E_Cannot use RESULT in this function',#000+
   '07085_H_RESULT is register $1'#000+
   '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
   '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
-  '07090_E_Cha','r > not allowed here'#000+
+  '07090_E_Char',' > not allowed here'#000+
   '07091_W_XDEF not supported'#000+
   '07092_E_Invalid XDEF syntax'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
-  '07097_E_68020 mode required'#000,
-  '08000_F_Too many assembler files'#000+
+  '07097_E_68020 mode required'#000+
+  '0','8000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
-  '08005_F_No binary writer sel','ected'#000+
+  '08005_F_No binary writer sele','cted'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
   '08010_E_Asm: Immediate or reference expected'#000+
-  '08011_E_As','m: $1 value exceeds bounds $2'#000+
+  '08011_E_Asm',': $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
   '08014_E_Asm: Comp type not supported for this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
-  '08016_E_Asm: Duplicate la','bel $1'#000+
+  '08016_E_Asm: Duplicate lab','el $1'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assember file: $1'#000+
   '09003_E_Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
-  '09005_E_Assembler $1 not found, switching to ext','ernal assembling'#000+
+  '09005_E_Assembler $1 not found, switching to exte','rnal assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
   'ssembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling smartlink $1'#000+
-  '09011_W_Object $1 not ','found, Linking may fail !'#000+
+  '09011_W_Object $1 not f','ound, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
   '09014_E_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
-  '09016_E_Util $1 not found, switching to external linking'#000,
-  '09017_T_Using util $1'#000+
+  '09016_E_Util $1 not found, switching to external linking'#000+
+  '0','9017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler not found, switching to external mode'#000+
-  '09022_I_Compiling resou','rce $1'#000+
+  '09022_I_Compiling resour','ce $1'#000+
   '09023_T_unit $1 can'#039't be static linked, switching to smart linking'+
   #000+
   '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
   #000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
-  '09026_E_unit $1 can'#039't be smart ','or static linked'#000+
+  '09026_E_unit $1 can'#039't be smart o','r static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_F_Can'#039't post process executable $1'#000+
   '09029_F_Can'#039't open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
   '09031_X_Size of initialized data: $1 bytes'#000+
-  '09032_X_Size of uninitiali','zed data: $1 bytes'#000+
+  '09032_X_Size of uninitializ','ed data: $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
   '09034_X_Stack space commited: $1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
@@ -589,81 +589,81 @@ const msgtxt : array[0..000140,1..240] of char=(
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU F','ile too short'#000+
+  '10006_U_PPU Fi','le too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for an other processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't',' Write PPU-File'#000+
+  '10013_F_Can'#039't ','Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between ','$1 and $2'#000+
+  '10020_F_Circular unit reference between $','1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
   '10025_W_Compiling the system unit requires the -Us switch'#000+
-  '10026_F_The','re were $1 errors compiling module, stopping'#000+
+  '10026_F_Ther','e were $1 errors compiling module, stopping'#000+
   '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
-  '10031_U_Reco','mpiling unit, shared lib is older than ppufile'#000+
+  '10031_U_Recom','piling unit, shared lib is older than ppufile'#000+
   '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
-  '10036_U_Second ','load for unit $1'#000+
+  '10036_U_Second l','oad for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
   '10038_H_Conditional $1 was not set at startup in last compilation of $'+
   '2'#000+
   '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+
-  '10040_W_Can'#039't recompile unit $1, but found modife','d include files'+
+  '10040_W_Can'#039't recompile unit $1, but found modifed',' include files'+
   #000+
   '10041_H_File $1 is newer than Release PPU file $2'#000+
   '11000_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
-  '11003_E_nested response files are not supported'#000,
-  '11004_F_No source file name in command line'#000+
+  '11003_E_nested response files are not supported'#000+
+  '1','1004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
   '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
-  '11010_D_Reading further optio','ns from $1'#000+
+  '11010_D_Reading further option','s from $1'#000+
   '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug informat','ion generation is not supported by this execut'+
+  '11016_W_Debug informati','on generation is not supported by this execut'+
   'able'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_E_You are using the obsolete switch $1'#000+
   '11019_E_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching assembler to default source wri','ting assembler'#000+
+  '11020_N_Switching assembler to default source writ','ing assembler'#000+
   '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
-  '11029__*** pre','ss enter ***'#000+
+  '11029__*** pres','s enter ***'#000+
   '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
-  'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
+  'Copyright (c) 1993-2002 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+
   'Compiler Target: $FPCTARGET'#010+
   #010+
-  'Supported targe','ts:'#010+
+  'Supported target','s:'#010+
   '  $OSTARGETS'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
@@ -671,19 +671,19 @@ const msgtxt : array[0..000140,1..240] of char=(
   #010+
   'Report bugs,suggestions etc to:'#010+
   '                 [email protected]'#000+
-  '11025_**0*_put + after a boolean switch option to enable',' it, - to di'+
+  '11025_**0*_put + after a boolean switch option to enable ','it, - to di'+
   'sable it'#010+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
   '**2ar_list register allocation/release info in assembler file'#010+
-  '**2at_list temp allocation/release info in assemb','ler file'#010+
+  '**2at_list temp allocation/release info in assembl','er file'#010+
   '**1b_generate browser info'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
   '**2CD_create also dynamic library (not supported)'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
-  '**2Ci_IO-chec','king'#010+
+  '**2Ci_IO-check','ing'#010+
   '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
   '**2Cr_range checking'#010+
@@ -691,28 +691,28 @@ const msgtxt : array[0..000140,1..240] of char=(
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
-  '*O1D_generate a DEF file'#010,
-  '*O2Dd<x>_set description to <x>'#010+
+  '*O1D_generate a DEF file'#010+
+  '*','O2Dd<x>_set description to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
   '**2FD<x>_sets the directory where to search for compiler utilities'#010+
-  '**2Fe<x>_redirect error output to <x>'#010,
-  '**2FE<x>_set exe/unit output path to <x>'#010+
+  '**2Fe<x>_redirect error output to <x>'#010+
+  '*','*2FE<x>_set exe/unit output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '*L2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
-  '**2Fu<x>_adds <x> to unit',' path'#010+
+  '**2Fu<x>_adds <x> to unit ','path'#010+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gg_use gsym'#010+
   '*g2gd_use dbx'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
-  '*g2gc','_generate checks for pointers'#010+
+  '*g2gc_','generate checks for pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
@@ -720,80 +720,80 @@ const msgtxt : array[0..000140,1..240] of char=(
   '**2iSP_return compiler processor'#010+
   '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
-  '**1I<x>_adds <x> to in','clude path'#010+
+  '**1I<x>_adds <x> to inc','lude path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
   '**1n_don'#039't read the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '*L1P_use pipes instead o','f creating temporary assembler files'#010+
+  '*L1P_use pipes instead of',' creating temporary assembler files'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_switch some Delphi 2 extensions on'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_tries to be Delphi compatible'#010+
-  '**2Se<x>_compiler stop','s after the <x> errors (default is 1)'#010+
+  '**2Se<x>_compiler stops',' after the <x> errors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sm_support macros like C (global)'#010+
   '**2So_tries to be TP/BP 7.0 compatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
-  '**2Ss_constr','uctor name must be init (destructor must be done)'#010+
+  '**2Ss_constru','ctor name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
   '**1s_don'#039't call assembler and linker (only with -a)'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
-  '**2Ur_generate r','elease unit files'#010+
+  '**2Ur_generate re','lease unit files'#010+
   '**2Us_compile a system unit'#010+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
   '**2*_e : Show errors (default)       d : Show debug info'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
-  '**2*_n : Show ','notes                  t : Show tried/used files'#010+
+  '**2*_n : Show n','otes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  m : Show defined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
   '**2*_l : Show linenumbers            c : Show conditionals'#010+
-  '**2*_','a : Show everything             0 : Show nothing (except errors'+
+  '**2*_a',' : Show everything             0 : Show nothing (except errors'+
   ')'#010+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#010+
   '**2*_    occurs'#010+
-  '**1X_executable opt','ions:'#010+
+  '**1X_executable opti','ons:'#010+
   '*L2Xc_link with the c library'#010+
   '**2Xs_strip all symbols from executable'#010+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XS_try to link static (default) (defines FPC_LINK_STATIC)'#010+
-  '**2XX_try to link smart            (defin','es FPC_LINK_SMART)'#010+
+  '**2XX_try to link smart            (define','s FPC_LINK_SMART)'#010+
   '**0*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
   '3*2Aas_assemble using GNU AS'#010+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+
   '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010,
-  '3*2Anasmobj_obj file using Nasm'#010+
+  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
+  '3','*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
   '3*1R<x>_assembler reading style:'#010+
-  '3*','2Ratt_read AT&T style assembler'#010+
+  '3*2','Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
   '3*2Rdirect_copy assembler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
-  '3*2Or_keep certain variab','les in registers'#010+
+  '3*2Or_keep certain variabl','es in registers'#010+
   '3*2Ou_enable uncertain optimizations (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
-  '3*2Op<x>_t','arget processor:'#010+
+  '3*2Op<x>_ta','rget processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '3*1T<x>_Target operating system:'#010+
-  '3*2TGO32V1_version 1 of DJ Delorie DOS ext','ender'#010+
+  '3*2TGO32V1_version 1 of DJ Delorie DOS exte','nder'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
   '3*2TLINUX_Linux'#010+
   '3*2Tnetware_Novell Netware Module (experimental)'#010+
@@ -801,12 +801,12 @@ const msgtxt : array[0..000140,1..240] of char=(
   '3*2TSUNOS_SunOS/Solaris'#010+
   '3*2TWin32_Windows 32 Bit'#010+
   '3*1W<x>_Win32 target options'#010+
-  '3*2WB<x>_Set Image base to',' Hexadecimal <x> value'#010+
+  '3*2WB<x>_Set Image base to ','Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
   '3*2WF_Specify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
-  '3*2WN_Do not generate relocation',' code (necessary for debugging)'#010+
+  '3*2WN_Do not generate relocation ','code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   '6*1A<x>_output format'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
@@ -814,14 +814,14 @@ const msgtxt : array[0..000140,1..240] of char=(
   '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   '6*1O_optimizations:'#010+
-  '6*2Oa_t','urn on the optimizer'#010+
+  '6*2Oa_tu','rn on the optimizer'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O2_set target processor to a MC68020+'#010+
   '6*1R<x>_assembler reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
-  '6*','1T<x>_Target operating system:'#010+
+  '6*1','T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
   '6*2TATARI_Atari ST/STe/TT'#010+
   '6*2TMACOS_Macintosh m68k'#010+

compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -292,6 +309,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -353,9 +371,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -479,11 +497,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -797,6 +817,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -1064,8 +1089,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -235,6 +252,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -296,9 +314,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -422,11 +440,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -740,6 +760,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -879,7 +904,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -911,7 +936,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -961,7 +986,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1034,8 +1059,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -91,6 +107,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -193,6 +210,7 @@ endif
 ifeq ($(OS_TARGET),os2)
 override TARGET_DIRS+=os2
 endif
+override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -243,6 +261,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -304,9 +323,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -430,11 +449,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -960,8 +981,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

demo/Makefile.fpc

@@ -13,6 +13,8 @@ dirs_win32=win32
 dirs_linux=linux
 dirs_os2=os2
 
+[install]
+fpcpackage=y
 
 [rules]
 #################################

demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/27]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -108,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -250,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -757,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -905,7 +912,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -987,7 +994,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)

demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/04]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -238,6 +255,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -299,9 +317,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -425,11 +443,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -743,6 +763,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -882,7 +907,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -964,7 +989,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1037,8 +1062,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -232,6 +249,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -293,9 +311,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -419,11 +437,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -737,6 +757,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -876,7 +901,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -908,7 +933,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -958,7 +983,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1031,8 +1056,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -232,6 +249,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -293,9 +311,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -419,11 +437,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -737,6 +757,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -876,7 +901,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -908,7 +933,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -958,7 +983,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1031,8 +1056,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -230,6 +247,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -291,9 +309,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -417,11 +435,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -735,6 +755,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -874,7 +899,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -906,7 +931,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -956,7 +981,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1029,8 +1054,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -232,6 +249,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -293,9 +311,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -419,11 +437,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -737,6 +757,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -876,7 +901,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -908,7 +933,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -958,7 +983,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1031,8 +1056,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -267,6 +284,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -328,9 +346,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -468,11 +486,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -806,6 +826,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -827,6 +852,11 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
 else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_PASZLIB=
 UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
@@ -848,6 +878,11 @@ UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
 else
 UNITDIR_INET=$(PACKAGEDIR_INET)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_INET)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_INET=
 UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
@@ -869,6 +904,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -890,6 +930,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -1047,7 +1092,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1079,7 +1124,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1129,7 +1174,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1281,8 +1326,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -245,6 +262,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -306,9 +324,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -446,11 +464,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -770,6 +790,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -791,6 +816,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -812,6 +842,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -969,7 +1004,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1001,7 +1036,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1051,7 +1086,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1124,8 +1159,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -235,6 +252,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -296,9 +314,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -422,11 +440,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -740,6 +760,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -891,7 +916,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -923,7 +948,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -973,7 +998,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1046,8 +1071,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -235,6 +252,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -296,9 +314,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -436,11 +454,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -765,6 +785,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -786,6 +811,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -943,7 +973,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -975,7 +1005,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1025,7 +1055,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1098,8 +1128,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -235,6 +252,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -296,9 +314,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -436,11 +454,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -765,6 +785,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -786,6 +811,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -943,7 +973,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -975,7 +1005,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1025,7 +1055,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1098,8 +1128,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -232,6 +249,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -293,9 +311,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -433,11 +451,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -782,6 +802,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -803,6 +828,11 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
 else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_PASZLIB=
 UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
@@ -824,6 +854,11 @@ UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
 else
 UNITDIR_INET=$(PACKAGEDIR_INET)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_INET)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_INET=
 UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
@@ -845,6 +880,11 @@ UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
 else
 UNITDIR_FCL=$(PACKAGEDIR_FCL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FCL=
 UNITDIR_FCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl/Package.fpc,$(UNITSDIR)))))
@@ -866,6 +906,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -887,6 +932,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -1032,7 +1082,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1064,7 +1114,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1114,7 +1164,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1187,8 +1237,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -235,6 +252,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -296,9 +314,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -422,11 +440,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -740,6 +760,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -891,7 +916,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -923,7 +948,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -973,7 +998,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1046,8 +1071,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -232,6 +249,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -293,9 +311,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -433,11 +451,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -807,6 +827,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -828,6 +853,11 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
 else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_PASZLIB=
 UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
@@ -849,6 +879,11 @@ UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
 else
 UNITDIR_INET=$(PACKAGEDIR_INET)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_INET)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_INET=
 UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
@@ -870,6 +905,11 @@ UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
 else
 UNITDIR_FCL=$(PACKAGEDIR_FCL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FCL=
 UNITDIR_FCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl/Package.fpc,$(UNITSDIR)))))
@@ -891,6 +931,11 @@ UNITDIR_GTK=$(PACKAGEDIR_GTK)/$(OS_TARGET)
 else
 UNITDIR_GTK=$(PACKAGEDIR_GTK)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_GTK)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_GTK) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_GTK=
 UNITDIR_GTK:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gtk/Package.fpc,$(UNITSDIR)))))
@@ -912,6 +957,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -933,6 +983,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -954,6 +1009,11 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET)
 else
 UNITDIR_X11=$(PACKAGEDIR_X11)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_X11)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_X11=
 UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
@@ -975,6 +1035,11 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/$(OS_TARGET)
 else
 UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_OPENGL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_OPENGL=
 UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR)))))
@@ -1129,7 +1194,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1161,7 +1226,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1211,7 +1276,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1284,8 +1349,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -238,6 +255,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -299,9 +317,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -439,11 +457,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -788,6 +808,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -809,6 +834,11 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
 else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_PASZLIB=
 UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
@@ -830,6 +860,11 @@ UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
 else
 UNITDIR_INET=$(PACKAGEDIR_INET)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_INET)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_INET=
 UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
@@ -851,6 +886,11 @@ UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
 else
 UNITDIR_FCL=$(PACKAGEDIR_FCL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FCL=
 UNITDIR_FCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl/Package.fpc,$(UNITSDIR)))))
@@ -872,6 +912,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -893,6 +938,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -1038,7 +1088,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1070,7 +1120,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1120,7 +1170,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1193,8 +1243,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -421,11 +439,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -739,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -875,7 +900,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -907,7 +932,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -957,7 +982,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1030,8 +1055,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fv/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -237,6 +254,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -298,9 +316,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -424,11 +442,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -742,6 +762,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -893,7 +918,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -975,7 +1000,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1127,8 +1152,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fv/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -230,6 +247,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -291,9 +309,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -417,11 +435,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -693,50 +713,50 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl fvision
+override REQUIRE_PACKAGES=rtl fv
 ifeq ($(OS_TARGET),linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),go32v2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),os2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),atari)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),sunos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),qnx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
@@ -746,6 +766,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -759,25 +784,30 @@ ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_FVISION
-PACKAGEDIR_FVISION:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fvision/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_FVISION),)
-ifneq ($(wildcard $(PACKAGEDIR_FVISION)/$(OS_TARGET)),)
-UNITDIR_FVISION=$(PACKAGEDIR_FVISION)/$(OS_TARGET)
+ifdef REQUIRE_PACKAGES_FV
+PACKAGEDIR_FV:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fv/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FV),)
+ifneq ($(wildcard $(PACKAGEDIR_FV)/$(OS_TARGET)),)
+UNITDIR_FV=$(PACKAGEDIR_FV)/$(OS_TARGET)
 else
-UNITDIR_FVISION=$(PACKAGEDIR_FVISION)
+UNITDIR_FV=$(PACKAGEDIR_FV)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FV)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
 endif
 else
-PACKAGEDIR_FVISION=
-UNITDIR_FVISION:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fvision/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_FVISION),)
-UNITDIR_FVISION:=$(firstword $(UNITDIR_FVISION))
+PACKAGEDIR_FV=
+UNITDIR_FV:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fv/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FV),)
+UNITDIR_FV:=$(firstword $(UNITDIR_FV))
 else
-UNITDIR_FVISION=
+UNITDIR_FV=
 endif
 endif
-ifdef UNITDIR_FVISION
-override COMPILER_UNITDIR+=$(UNITDIR_FVISION)
+ifdef UNITDIR_FV
+override COMPILER_UNITDIR+=$(UNITDIR_FV)
 endif
 endif
 ifndef NOCPUDEF
@@ -906,7 +936,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -938,7 +968,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -988,7 +1018,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1061,8 +1091,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fv/test/Makefile.fpc

@@ -6,7 +6,7 @@
 programs=tfileio testapp
 
 [require]
-packages=fvision
+packages=fv
 
 [default]
 fpcdir=../..

fvision/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -237,6 +254,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -298,9 +316,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -424,11 +442,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -742,6 +762,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -893,7 +918,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -975,7 +1000,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1127,8 +1152,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fvision/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -230,6 +247,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -291,9 +309,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -417,11 +435,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -693,50 +713,50 @@ else
 TAROPT=vz
 TAREXT=.tar.gz
 endif
-override REQUIRE_PACKAGES=rtl fvision
+override REQUIRE_PACKAGES=rtl fv
 ifeq ($(OS_TARGET),linux)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),go32v2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),win32)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),os2)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),freebsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),beos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),netbsd)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),amiga)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),atari)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),sunos)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifeq ($(OS_TARGET),qnx)
 REQUIRE_PACKAGES_RTL=1
-REQUIRE_PACKAGES_FVISION=1
+REQUIRE_PACKAGES_FV=1
 endif
 ifdef REQUIRE_PACKAGES_RTL
 PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/$(OS_TARGET)/Makefile.fpc,$(PACKAGESDIR))))))
@@ -746,6 +766,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -759,25 +784,30 @@ ifdef UNITDIR_RTL
 override COMPILER_UNITDIR+=$(UNITDIR_RTL)
 endif
 endif
-ifdef REQUIRE_PACKAGES_FVISION
-PACKAGEDIR_FVISION:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fvision/Makefile.fpc,$(PACKAGESDIR))))))
-ifneq ($(PACKAGEDIR_FVISION),)
-ifneq ($(wildcard $(PACKAGEDIR_FVISION)/$(OS_TARGET)),)
-UNITDIR_FVISION=$(PACKAGEDIR_FVISION)/$(OS_TARGET)
+ifdef REQUIRE_PACKAGES_FV
+PACKAGEDIR_FV:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fv/Makefile.fpc,$(PACKAGESDIR))))))
+ifneq ($(PACKAGEDIR_FV),)
+ifneq ($(wildcard $(PACKAGEDIR_FV)/$(OS_TARGET)),)
+UNITDIR_FV=$(PACKAGEDIR_FV)/$(OS_TARGET)
 else
-UNITDIR_FVISION=$(PACKAGEDIR_FVISION)
+UNITDIR_FV=$(PACKAGEDIR_FV)
+endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FV)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
 endif
 else
-PACKAGEDIR_FVISION=
-UNITDIR_FVISION:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fvision/Package.fpc,$(UNITSDIR)))))
-ifneq ($(UNITDIR_FVISION),)
-UNITDIR_FVISION:=$(firstword $(UNITDIR_FVISION))
+PACKAGEDIR_FV=
+UNITDIR_FV:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fv/Package.fpc,$(UNITSDIR)))))
+ifneq ($(UNITDIR_FV),)
+UNITDIR_FV:=$(firstword $(UNITDIR_FV))
 else
-UNITDIR_FVISION=
+UNITDIR_FV=
 endif
 endif
-ifdef UNITDIR_FVISION
-override COMPILER_UNITDIR+=$(UNITDIR_FVISION)
+ifdef UNITDIR_FV
+override COMPILER_UNITDIR+=$(UNITDIR_FV)
 endif
 endif
 ifndef NOCPUDEF
@@ -906,7 +936,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -938,7 +968,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -988,7 +1018,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1061,8 +1091,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

fvision/test/Makefile.fpc

@@ -6,7 +6,7 @@
 programs=tfileio testapp
 
 [require]
-packages=fvision
+packages=fv
 
 [default]
 fpcdir=../..

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -179,8 +196,8 @@ else
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override PACKAGE_NAME=fpide
-override PACKAGE_VERSION=1.0.5
+override PACKAGE_NAME=ide
+override PACKAGE_VERSION=1.0.6
 ifeq ($(OS_TARGET),linux)
 ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
 override FPCOPT+=-dUNIX
@@ -284,6 +301,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -345,9 +363,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -485,11 +503,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -836,6 +856,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -857,6 +882,11 @@ UNITDIR_FV=$(PACKAGEDIR_FV)/$(OS_TARGET)
 else
 UNITDIR_FV=$(PACKAGEDIR_FV)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FV)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FV=
 UNITDIR_FV:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fv/Package.fpc,$(UNITSDIR)))))
@@ -878,6 +908,11 @@ UNITDIR_GDBINT=$(PACKAGEDIR_GDBINT)/$(OS_TARGET)
 else
 UNITDIR_GDBINT=$(PACKAGEDIR_GDBINT)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_GDBINT)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_GDBINT) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_GDBINT)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_GDBINT=
 UNITDIR_GDBINT:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gdbint/Package.fpc,$(UNITSDIR)))))
@@ -899,6 +934,11 @@ UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)/$(OS_TARGET)
 else
 UNITDIR_REGEXPR=$(PACKAGEDIR_REGEXPR)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_REGEXPR)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_REGEXPR) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_REGEXPR)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_REGEXPR=
 UNITDIR_REGEXPR:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /regexpr/Package.fpc,$(UNITSDIR)))))
@@ -1044,7 +1084,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1076,7 +1116,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1126,7 +1166,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1278,8 +1318,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

ide/Makefile.fpc

@@ -3,8 +3,8 @@
 #
 
 [package]
-name=fpide
-version=1.0.5
+name=ide
+version=1.0.6
 
 [target]
 dirs=compiler fakegdb

ide/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -245,6 +262,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -306,9 +324,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -432,11 +450,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -750,6 +770,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -886,7 +911,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -918,7 +943,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -968,7 +993,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1041,8 +1066,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

ide/fakegdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -231,6 +248,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -292,9 +310,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -418,11 +436,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -736,6 +756,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -872,7 +897,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -904,7 +929,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -954,7 +979,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1027,8 +1052,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

install/debian/README.Debian

@@ -3,8 +3,8 @@ Free Pascal for DEBIAN
 
 No changes were necessary to the source tree as checked out from
 CVS at cvs.freepascal.org by
- cvs -d :pserver:[email protected]:/FPC/CVS -z3 co -r RELEASE_1_0_4 fpc
-The Debian Build Directory was created by 'make debcopy FPC_VERSION=1.0.4'
+ cvs -d :pserver:[email protected]:/FPC/CVS -z3 co -r RELEASE_1_0_6 fpc
+The Debian Build Directory was created by 'make debcopy FPC_VERSION=1.0.6'
 and then duplicated to .orig before 'dpkg-buildpackage -sa -rfakeroot' was
 run.
 
@@ -20,7 +20,7 @@ As shipped, only the .pdf docs are built. You may want to make the HTML
 files with latex2html by yourself, and eventually adapt the doc-base file.
      
 To create a new config file for fpc (/etc/fpc.cfg) use the command:
- /usr/lib/fpc/1.0.4/samplecfg /usr/lib/fpc/1.0.4
+ /usr/lib/fpc/1.0.6/samplecfg /usr/lib/fpc/1.0.6
 However, you should be aware, that said file /etc/fpc.cfg is
 declared as a conffile since version 1.0.2.
 
@@ -38,7 +38,6 @@ The Original site is
   ftp://ftp.freepascal.org/
   
 HTTP Mirrored at  
-  http://www.brain.uni-freiburg.de/~klaus/fpc/
   http://www.zeus.rug.ac.be/freepascal/
   http://gd.tuwien.ac.at/languages/pascal/fpc/www/
   http://www.atlasz.com/freepascal/

install/debian/changelog

@@ -2,8 +2,14 @@ fpc (1.1-0) unstable; urgency=low
 
   * Snapshot release
 
- -- Peter Vreman <[email protected]>  Tue,  2 Jan 2001 11:01:50 +0100
+ -- Peter Vreman <[email protected]>  Tue,  1 Mrt 2002 11:01:50 +0100
  
+fpc (1.0.6-0) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Peter Vreman <[email protected]>  Tue,  1 Mrt 2002 11:01:50 +0100
+
 fpc (1.0.4-1) unstable; urgency=low
 
   * New upstream version.

install/debian/copyright

@@ -2,7 +2,7 @@ The package was originally put together by:
   Peter Vreman <[email protected]>
 
 From sources obtained from:
-  ftp://ftp.freepascal.org/pub/fpc/dist/linux/fpc-1.0.2.tar.gz
+  ftp://ftp.freepascal.org/pub/fpc/dist/linux/fpc-1.0.6.tar.gz
 
 The files and libraries are released under the terms of the GNU Library
 General Public License, which can be found in the file

installer/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -179,7 +196,7 @@ else
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override PACKAGE_NAME=fpinst
+override PACKAGE_NAME=installer
 override PACKAGE_VERSION=1.0.6
 ifeq ($(OS_TARGET),linux)
 override TARGET_PROGRAMS+=installer
@@ -249,6 +266,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -310,9 +328,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -436,11 +454,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -776,6 +796,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -797,6 +822,11 @@ UNITDIR_FV=$(PACKAGEDIR_FV)/$(OS_TARGET)
 else
 UNITDIR_FV=$(PACKAGEDIR_FV)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FV)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FV=
 UNITDIR_FV:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fv/Package.fpc,$(UNITSDIR)))))
@@ -818,6 +848,11 @@ UNITDIR_UNZIP=$(PACKAGEDIR_UNZIP)/$(OS_TARGET)
 else
 UNITDIR_UNZIP=$(PACKAGEDIR_UNZIP)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_UNZIP)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_UNZIP) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_UNZIP)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_UNZIP=
 UNITDIR_UNZIP:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /unzip/Package.fpc,$(UNITSDIR)))))
@@ -957,7 +992,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1039,7 +1074,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1191,8 +1226,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

installer/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [package]
-name=fpinst
+name=installer
 version=1.0.6
 
 [target]

installer/install.dat

@@ -31,9 +31,11 @@ package=utilgo32.zip,~E~xtra Utilities
 package=makego32.zip,GNU ~U~tilities (needed for Makefile usage)
 package=gdbgo32.zip,GNU ~D~ebugger for Go32v2
 package=ufclgo32.zip,~F~ree Component Libary (FCL)
-package=ubasgo32.zip,Basic ~u~nits (needed by FCL)
-package=unetgo32.zip,~N~etworking units
-package=umisgo32.zip,~M~iscellaneous units
+package=ugdbintgo32.zip[ugdbgo32.zip],GDB Interfacing units
+package=upaszlibgo32.zip[upzlgo32.zip],PasZLib units
+package=uregexprgo32.zip[ureggo32.zip],Regular expression units
+package=uunzipgo32.zip[uzipgo32.zip],Unzip units
+package=uuncgigo32.zip[ucgigo32.zip],Uncgi units
 #package=ufvgo32.zip,Free ~V~ision (FV)
 
 
@@ -51,16 +53,22 @@ filecheck=*w32.zip
 package=basew32.zip,~B~asic system for Win32 (required)
 package=asldw32.zip,GNU ~L~inker and GNU Assembler for Win32 (required)
 package=idew32.zip,~I~DE with integrated debugger/compiler (BETA)
-package=utilw32.zip,~E~xtra Utilities
+package=utilsw32.zip,~E~xtra Utilities
 package=makew32.zip,GNU ~U~tilities (needed for Makefile usage)
 package=gdbw32.zip,GNU ~D~ebugger for Win32
 package=ufclw32.zip,~F~ree Component Libary (FCL)
-package=ubasw32.zip,~B~asic units (needed by FCL)
-package=ugfxw32.zip,O~p~enGL units
-package=ugtkw32.zip,GT~K~ units
-package=unetw32.zip,~N~etworking units
-package=udbw32.zip,Da~t~abase (interbase,mysql) units
-package=umisw32.zip,~M~iscellaneous units
+package=uopenglw32.zip,OpenGL units
+package=ugtkw32.zip,GTK units
+package=uinetw32.zip,Internet helper routines units
+package=uibasew32.zip,Interbase interface units
+package=umysqlw32.zip,MySQL interface units
+package=ummsystemw32.zip,MMSystem interface units
+package=ugdbintw32.zip,GDB Interfacing units
+package=upaszlibw32.zip,PasZLib units
+package=uregexprw32.zip,Regular expression units
+package=uunzipgo32.zip,Unzip units
+package=uuncgigo32.zip,Uncgi units
+package=uzlibw32.zip,ZLib interface units
 #package=ufvw32.zip,Free ~V~ision (FV)
 
 
@@ -93,8 +101,6 @@ pack=C~o~mmon
 package=docs-pdf.zip,Documentation (~P~DF)
 package=doc-htm.zip,Documentation (~H~MTL)
 package=demo.zip,D~e~mos
-package=ufclexm.zip,Examples for ~F~CL
-package=upkgexm.zip,Examples for ~P~ackages
 
 
 #
@@ -103,17 +109,29 @@ package=upkgexm.zip,Examples for ~P~ackages
 pack=~S~ources
 filecheck=*src.zip
 package=basesrc.zip,~B~asic Makefiles for the sources
-package=compsrc.zip,~C~ompiler sources
+package=compilersrc.zip[compsrc.zip],~C~ompiler sources
 package=rtlsrc.zip,~R~un time library sources
 package=fclsrc.zip,~F~ree component library (FCL) sources
-package=pkgssrc.zip,~P~ackages units sources
-package=utilsrc.zip,~U~tils sources
-package=instsrc.zip,~I~nstaller sources
+package=utilssrc.zip[utilsrc.zip],~U~tils sources
+package=installersrc.zip[instsrc.zip],~I~nstaller sources
 package=docsrc.zip,~D~ocumentation sources (LaTeX)
+package=ugdbintsrc.zip[ugdbsrc.zip],GDB Interfacing units
+package=upaszlibsrc.zip[upzlsrc.zip],PasZLib units
+package=uregexprsrc.zip[uregsrc.zip],Regular expression units
+package=uunzipsrc.zip[uzipsrc.zip],Unzip units
+package=uuncgisrc.zip[ucgisrc.zip],Uncgi units
+package=uopenglsrc.zip,OpenGL units
+package=ugtksrc.zip,GTK units
+package=uinetsrc.zip,Internet helper routines units
+package=uibasesrc.zip,Interbase interface units
+package=umysqlsrc.zip,MySQL interface units
+package=ummsystemsrc.zip,MMSystem interface units
+package=uzlibsrc.zip,ZLib interface units
+
 
 defaultcfg=
 #
-# Example fpc.cfg for Free Pascal Compiler Version 1.0.4
+# Example fpc.cfg for Free Pascal Compiler Version 1.0.6
 #
 
 # ----------------------

installer/install.pas

@@ -114,8 +114,10 @@ program install;
 
   type
      tpackage=record
-       name  : string[60];
-       zip   : string[12];
+       name      : string[60];
+       zip       : string[40];  { default zipname }
+       zipshort  : string[12];  { 8.3 zipname }
+       diskspace : longint;     { diskspace required }
      end;
 
      tpack=record
@@ -232,8 +234,8 @@ program install;
      UnzDlg      : punzipdialog;
      log         : text;
      createlog   : boolean;
-{$IFNDEF DLL}
 
+{$IFNDEF DLL}
   const
      UnzipErr: longint = 0;
 {$ENDIF}
@@ -288,6 +290,23 @@ program install;
     end;
 
 
+  function DotStr(l:longint):string;
+    var
+      TmpStr : string[32];
+      i : longint;
+    begin
+      Str(l,TmpStr);
+      i:=Length(TmpStr);
+      while (i>3) do
+       begin
+         i:=i-3;
+         if TmpStr[i]<>'-' then
+          Insert('.',TmpStr,i+1);
+       end;
+      DotStr:=TmpStr;
+    end;
+
+
   function file_exists(const f : string;const path : string) : boolean;
     begin
        file_exists:=fsearch(f,path)<>'';
@@ -340,25 +359,22 @@ program install;
       s : string;
     begin
       s:=zipfile+#0;
-      if not (IsZip (@S [1])) then DiskSpaceN := -1 else
-      begin
-       Uncompressed:=UnzipSize(@s[1],compressed);
-       DiskSpaceN:=uncompressed shr 10;
-      end;
+      if not (IsZip (@S [1])) then
+       DiskSpaceN := -1
+      else
+       begin
+         Uncompressed:=UnzipSize(@s[1],compressed);
+         DiskSpaceN:=uncompressed shr 10;
+       end;
     end;
 
 
-  function diskspace(const zipfile : string) : string;
-    var
-      uncompressed : longint;
-      s : string;
+  function diskspacestr(uncompressed : longint) : string;
     begin
-      uncompressed:=DiskSpaceN (zipfile);
-      if Uncompressed = -1 then DiskSpace := ' [INVALID]' else
-      begin
-       str(uncompressed,s);
-       diskspace:=' ('+s+' KB)';
-      end;
+      if Uncompressed = -1 then
+       DiskSpacestr := ' [INVALID]'
+      else
+       diskspacestr:=' ('+DotStr(uncompressed)+' KB)';
     end;
 
 
@@ -521,14 +537,12 @@ program install;
     var
        LS : PFPHTMLFileLinkScanner;
        BS : PBufStream;
-       S : String;
        Re : Word;
        params : array[0..0] of pointer;
        dir    : searchrec;
        r : trect;
 
     begin
-       S:='HTML Index';
        r.assign(10,10,70,15);
        indexdlg:=new(phtmlindexdialog,init(r,'Creating HTML index file, please wait ...'));
        desktop^.insert(indexdlg);
@@ -652,7 +666,7 @@ program install;
 
 {$IFNDEF DLL}
   procedure UnzipCheckFn (Retcode: longint; Rec: pReportRec );{$ifdef Delphi32}STDCALL;{$endif}
-  {$IFNDEF BIT32} FAR;{$ENDIF BIT32}
+  {$ifndef fpc}{$IFNDEF BIT32} FAR;{$ENDIF BIT32}{$endif}
   var
     name : string;
   begin
@@ -689,7 +703,6 @@ program install;
     var
       again : boolean;
       fn,dir,wild : string;
-      Cnt: integer;
     begin
        Disposestr(filetext^.text);
        filetext^.Text:=NewStr(#3'File: '+s + #13#3' ');
@@ -846,13 +859,13 @@ program install;
          islfn:=true;
     end;
 
-  function haslfn(const zipfile,path : string) : boolean;
+  function haslfn(const zipfile : string) : boolean;
 
     var
        buf : array[0..255] of char;
 
     begin
-       strpcopy(buf,path+DirSep+zipfile);
+       strpcopy(buf,zipfile);
        islfn:=false;
 {$ifdef FPC}
        ViewZip(buf,AllFiles,@lfnreport);
@@ -891,6 +904,7 @@ program install;
        scrollbox: pscrollbox;
        sbr,sbsbr: trect;
        sbsb: pscrollbar;
+       zipfile : string;
     begin
        f:=nil;
      { walk packages reverse and insert a newsitem for each, and set the mask }
@@ -902,18 +916,29 @@ program install;
            packmask[j]:=0;
            for i:=packages downto 1 do
             begin
+              zipfile:='';
               if file_exists(package[i].zip,startpath) then
+               zipfile:=startpath+DirSep+package[i].zip
+              else if file_exists(package[i].zipshort,startpath) then
                begin
+                 zipfile:=startpath+DirSep+package[i].zipshort;
+                 { update package to replace the full zipname with the short name }
+                 package[i].zip:=package[i].zipshort;
+               end;
+              if zipfile<>'' then
+               begin
+                 { get diskspace required }
+                 package[i].diskspace:=diskspaceN(zipfile);
 {$ifdef MAYBE_LFN}
                  if not(locallfnsupport) then
                    begin
-                      if not(haslfn(package[i].zip,startpath)) then
+                      if not(haslfn(zipfile)) then
                         begin
-                           items[j]:=newsitem(package[i].name+diskspace(startpath+DirSep+package[i].zip),items[j]);
+                           items[j]:=newsitem(package[i].name+diskspacestr(package[i].diskspace),items[j]);
                            packmask[j]:=packmask[j] or packagemask(i);
                            firstitem[j]:=i;
                            if createlog then
-                             writeln(log,'Checking lfn usage for ',startpath+DirSep+package[i].zip,' ... no lfn');
+                             writeln(log,'Checking lfn usage for ',zipfile,' ... no lfn');
                         end
                       else
                         begin
@@ -921,13 +946,13 @@ program install;
                            packmask[j]:=packmask[j] or packagemask(i);
                            firstitem[j]:=i;
                            if createlog then
-                             writeln(log,'Checking lfn usage for ',startpath+DirSep+package[i].zip,' ... uses lfn');
+                             writeln(log,'Checking lfn usage for ',zipfile,' ... uses lfn');
                         end;
                    end
                  else
 {$endif MAYBE_LFN}
                    begin
-                      items[j]:=newsitem(package[i].name+diskspace(startpath+DirSep+package[i].zip),items[j]);
+                      items[j]:=newsitem(package[i].name+diskspacestr(package[i].diskspace),items[j]);
                       packmask[j]:=packmask[j] or packagemask(i);
                       firstitem[j]:=i;
                    end;
@@ -1121,7 +1146,7 @@ program install;
                        begin
                          if data.packmask[j] and packagemask(i)<>0 then
                          begin
-                          ASpace := DiskSpaceN (package[i].zip);
+                          ASpace := package[i].diskspace;
                           if ASpace = -1 then
                               MessageBox ('File ' + package[i].zip +
                                             ' is probably corrupted!', nil,
@@ -1214,10 +1239,10 @@ program install;
   procedure tapp.readcfg(const fn:string);
     var
       t    : text;
-      i,j,
+      i,j,k,
       line : longint;
       item,
-      s    : string;
+      s,hs   : string;
       params : array[0..0] of pointer;
 
 {$ifndef FPC}
@@ -1423,9 +1448,18 @@ program install;
                       if (j>0) and (packages<maxpackages) then
                        begin
                          inc(packages);
-                         package[packages].zip:=copy(s,1,j-1);
+                         hs:=copy(s,1,j-1);
+                         k:=pos('[',hs);
+                         if (k>0) then
+                          begin
+                            package[packages].zip:=Copy(hs,1,k-1);
+                            package[packages].zipshort:=Copy(hs,k+1,length(hs)-k-1);
+                          end
+                         else
+                          package[packages].zip:=hs;
                          package[packages].name:=copy(s,j+1,255);
                        end;
+                      package[packages].diskspace:=-1;
                     end;
                  end
              end;
@@ -1608,7 +1642,7 @@ begin
 {$endif MAYBE_LFN}
         else if paramstr(i)='-h' then
           begin
-             writeln('FPC Installer Copyright (c) 1993-2001 Florian Klaempfl');
+             writeln('FPC Installer Copyright (c) 1993-2002 Florian Klaempfl');
              writeln('Command line options:');
              writeln('  -l   create log file');
 {$ifdef MAYBE_LFN}
@@ -1658,7 +1692,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.3  2002-02-28 17:02:08  pierre
+  Revision 1.4  2002-02-28 21:30:34  peter
+    * regenated
+
+  Revision 1.3  2002/02/28 17:02:08  pierre
    * fix win32 compilation if DEBUG cond is set
 
   Revision 1.2  2002/01/29 22:01:17  peter

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -231,6 +248,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -292,9 +310,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -418,11 +436,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -869,8 +889,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/Makefile.fpc

@@ -7,6 +7,7 @@ dirs=base extra
 
 [install]
 fpcpackage=y
+sourcesubdir=packages
 
 [default]
 fpcdir=..

packages/base/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -246,6 +263,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -307,9 +325,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -433,11 +451,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -884,8 +904,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/Makefile.fpc

@@ -16,6 +16,7 @@ dirs_freebsd=inet gdbint libasync \
 
 [install]
 fpcpackage=y
+sourcesubdir=packages/base
 
 [default]
 fpcdir=../..

packages/base/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -236,6 +253,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -297,9 +315,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -437,11 +455,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -755,6 +775,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -912,7 +937,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -944,7 +969,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -994,7 +1019,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1146,8 +1171,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -91,6 +107,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -228,6 +245,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -289,9 +307,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -415,11 +433,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -866,8 +886,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -421,11 +439,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -739,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -890,7 +915,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -922,7 +947,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -972,7 +997,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1124,8 +1149,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/libasync/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/30]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -189,9 +206,6 @@ endif
 ifeq ($(OS_TARGET),freebsd)
 override COMPILER_SOURCEDIR+=unix
 endif
-ifeq ($(OS_TARGET),netbsd)
-override COMPILER_SOURCEDIR+=unix
-endif
 override COMPILER_TARGETDIR+=.
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -243,6 +257,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -304,9 +319,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -430,11 +445,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -748,6 +765,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -884,7 +906,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -966,7 +988,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1118,8 +1140,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -232,6 +249,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -293,9 +311,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -433,11 +451,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -793,6 +813,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -814,6 +839,11 @@ UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)/$(OS_TARGET)
 else
 UNITDIR_ORACLE=$(PACKAGEDIR_ORACLE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_ORACLE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_ORACLE=
 UNITDIR_ORACLE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /oracle/Package.fpc,$(UNITSDIR)))))
@@ -835,6 +865,11 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
 else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_PASZLIB=
 UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
@@ -856,6 +891,11 @@ UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
 else
 UNITDIR_INET=$(PACKAGEDIR_INET)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_INET)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_INET=
 UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
@@ -877,6 +917,11 @@ UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
 else
 UNITDIR_FCL=$(PACKAGEDIR_FCL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FCL=
 UNITDIR_FCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl/Package.fpc,$(UNITSDIR)))))
@@ -898,6 +943,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -919,6 +969,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -1076,7 +1131,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1108,7 +1163,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1158,7 +1213,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1231,8 +1286,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -421,11 +439,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -739,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -890,7 +915,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -922,7 +947,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -972,7 +997,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1124,8 +1149,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/base/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -235,6 +252,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -296,9 +314,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -422,11 +440,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -740,6 +760,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -891,7 +916,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -923,7 +948,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -973,7 +998,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1125,8 +1150,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/11]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -248,6 +265,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -309,9 +327,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -886,8 +906,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/Makefile.fpc

@@ -22,6 +22,7 @@ dirs_go32v2=unzip uncgi
 
 [install]
 fpcpackage=y
+sourcesubdir=packages/extra
 
 [default]
 fpcdir=../..

packages/extra/bfd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -233,6 +250,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -294,9 +312,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -420,11 +438,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -738,6 +758,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -874,7 +899,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -906,7 +931,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -956,7 +981,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1108,8 +1133,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -421,11 +439,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -739,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -890,7 +915,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -922,7 +947,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -972,7 +997,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1124,8 +1149,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -235,6 +252,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -296,9 +314,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -436,11 +454,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -765,6 +785,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -786,6 +811,11 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET)
 else
 UNITDIR_X11=$(PACKAGEDIR_X11)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_X11)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_X11=
 UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
@@ -955,7 +985,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -987,7 +1017,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1037,7 +1067,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1189,8 +1219,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -231,6 +248,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -292,9 +310,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -432,11 +450,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -772,6 +792,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -793,6 +818,11 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET)
 else
 UNITDIR_X11=$(PACKAGEDIR_X11)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_X11)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_X11=
 UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
@@ -814,6 +844,11 @@ UNITDIR_FORMS=$(PACKAGEDIR_FORMS)/$(OS_TARGET)
 else
 UNITDIR_FORMS=$(PACKAGEDIR_FORMS)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FORMS)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FORMS) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FORMS)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FORMS=
 UNITDIR_FORMS:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /forms/Package.fpc,$(UNITSDIR)))))
@@ -959,7 +994,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -991,7 +1026,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1041,7 +1076,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1114,8 +1149,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/fpasync/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -242,6 +259,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -303,9 +321,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -443,11 +461,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -803,6 +823,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -824,6 +849,11 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
 else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_PASZLIB=
 UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
@@ -845,6 +875,11 @@ UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
 else
 UNITDIR_INET=$(PACKAGEDIR_INET)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_INET)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_INET=
 UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
@@ -866,6 +901,11 @@ UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
 else
 UNITDIR_FCL=$(PACKAGEDIR_FCL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FCL=
 UNITDIR_FCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl/Package.fpc,$(UNITSDIR)))))
@@ -887,6 +927,11 @@ UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)/$(OS_TARGET)
 else
 UNITDIR_LIBASYNC=$(PACKAGEDIR_LIBASYNC)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_LIBASYNC)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_LIBASYNC) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_LIBASYNC)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_LIBASYNC=
 UNITDIR_LIBASYNC:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /libasync/Package.fpc,$(UNITSDIR)))))
@@ -908,6 +953,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -929,6 +979,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -1071,7 +1126,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1103,7 +1158,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1153,7 +1208,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1305,8 +1360,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -421,11 +439,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -739,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -890,7 +915,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -922,7 +947,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -972,7 +997,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1124,8 +1149,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -237,6 +254,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -298,9 +316,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -438,11 +456,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -770,6 +790,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -791,6 +816,11 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET)
 else
 UNITDIR_X11=$(PACKAGEDIR_X11)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_X11)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_X11=
 UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
@@ -812,6 +842,11 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/$(OS_TARGET)
 else
 UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_OPENGL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_OPENGL=
 UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR)))))
@@ -969,7 +1004,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1001,7 +1036,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1051,7 +1086,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1203,8 +1238,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -233,6 +250,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -294,9 +312,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -434,11 +452,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -777,6 +797,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -798,6 +823,11 @@ UNITDIR_GTK=$(PACKAGEDIR_GTK)/$(OS_TARGET)
 else
 UNITDIR_GTK=$(PACKAGEDIR_GTK)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_GTK)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_GTK) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_GTK=
 UNITDIR_GTK:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gtk/Package.fpc,$(UNITSDIR)))))
@@ -819,6 +849,11 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET)
 else
 UNITDIR_X11=$(PACKAGEDIR_X11)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_X11)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_X11=
 UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
@@ -840,6 +875,11 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/$(OS_TARGET)
 else
 UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_OPENGL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_OPENGL=
 UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR)))))
@@ -985,7 +1025,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1017,7 +1057,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1067,7 +1107,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1140,8 +1180,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -230,6 +247,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -291,9 +309,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -431,11 +449,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -763,6 +783,11 @@ UNITDIR_GTK=$(PACKAGEDIR_GTK)/$(OS_TARGET)
 else
 UNITDIR_GTK=$(PACKAGEDIR_GTK)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_GTK)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_GTK) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_GTK=
 UNITDIR_GTK:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /gtk/Package.fpc,$(UNITSDIR)))))
@@ -784,6 +809,11 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET)
 else
 UNITDIR_X11=$(PACKAGEDIR_X11)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_X11)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_X11=
 UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
@@ -805,6 +835,11 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/$(OS_TARGET)
 else
 UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_OPENGL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_OPENGL=
 UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR)))))
@@ -999,8 +1034,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -767,6 +787,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -788,6 +813,11 @@ UNITDIR_X11=$(PACKAGEDIR_X11)/$(OS_TARGET)
 else
 UNITDIR_X11=$(PACKAGEDIR_X11)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_X11)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_X11=
 UNITDIR_X11:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /x11/Package.fpc,$(UNITSDIR)))))
@@ -809,6 +839,11 @@ UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)/$(OS_TARGET)
 else
 UNITDIR_OPENGL=$(PACKAGEDIR_OPENGL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_OPENGL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_OPENGL=
 UNITDIR_OPENGL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /opengl/Package.fpc,$(UNITSDIR)))))
@@ -966,7 +1001,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -998,7 +1033,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1048,7 +1083,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1121,8 +1156,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -233,6 +250,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -294,9 +312,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -434,11 +452,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -763,6 +783,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -784,6 +809,11 @@ UNITDIR_ZLIB=$(PACKAGEDIR_ZLIB)/$(OS_TARGET)
 else
 UNITDIR_ZLIB=$(PACKAGEDIR_ZLIB)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_ZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_ZLIB) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_ZLIB)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_ZLIB=
 UNITDIR_ZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /zlib/Package.fpc,$(UNITSDIR)))))
@@ -926,7 +956,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -958,7 +988,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1008,7 +1038,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1160,8 +1190,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/mmsystem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -233,6 +250,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -294,9 +312,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -420,11 +438,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -738,6 +758,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -874,7 +899,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -906,7 +931,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -956,7 +981,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1108,8 +1133,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/numlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -233,6 +250,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -294,9 +312,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -420,11 +438,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -738,6 +758,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -874,7 +899,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -906,7 +931,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -956,7 +981,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1108,8 +1133,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -435,11 +453,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -753,6 +773,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -910,7 +935,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -942,7 +967,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -992,7 +1017,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1144,8 +1169,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -421,11 +439,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -739,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -890,7 +915,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -922,7 +947,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -972,7 +997,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1124,8 +1149,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/unzip/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -236,6 +253,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -297,9 +315,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -423,11 +441,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -741,6 +761,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -877,7 +902,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -909,7 +934,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -959,7 +984,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1111,8 +1136,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -421,11 +439,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -739,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -890,7 +915,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -922,7 +947,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -972,7 +997,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1124,8 +1149,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -233,6 +250,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -294,9 +312,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -434,11 +452,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -752,6 +772,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -894,7 +919,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -926,7 +951,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -976,7 +1001,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1128,8 +1153,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

packages/extra/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -233,6 +250,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -294,9 +312,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -434,11 +452,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -752,6 +772,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -894,7 +919,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -926,7 +951,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -976,7 +1001,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1128,8 +1153,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -254,6 +271,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -315,9 +333,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -441,11 +459,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -835,7 +855,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -885,7 +905,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1037,8 +1057,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/amiga/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 OS_TARGET=amiga
 CPU_TARGET=m68k
 override DEFAULT_FPCDIR=../..
@@ -94,6 +110,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -254,6 +271,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -315,9 +333,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -441,11 +459,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -855,7 +875,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -887,7 +907,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -937,7 +957,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1010,8 +1030,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/beos/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 OS_TARGET=beos
 CPU_TARGET=i386
 override DEFAULT_FPCDIR=../..
@@ -94,6 +110,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -249,6 +266,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -310,9 +328,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -436,11 +454,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -850,7 +870,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -882,7 +902,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -932,7 +952,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1005,8 +1025,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/freebsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 OS_TARGET=freebsd
 override DEFAULT_FPCDIR=../..
 ifndef FPC
@@ -93,6 +109,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -261,6 +278,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -322,9 +340,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -448,11 +466,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -862,7 +882,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -894,7 +914,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -944,7 +964,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1017,8 +1037,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 OS_TARGET=go32v1
 CPU_TARGET=i386
 override DEFAULT_FPCDIR=../..
@@ -94,6 +110,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -247,6 +264,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -308,9 +326,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -434,11 +452,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -848,7 +868,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -880,7 +900,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -930,7 +950,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1003,8 +1023,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 OS_TARGET=go32v2
 CPU_TARGET=i386
 override DEFAULT_FPCDIR=../..
@@ -94,6 +110,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -254,6 +271,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -315,9 +333,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -441,11 +459,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -855,7 +875,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -887,7 +907,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -937,7 +957,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1010,8 +1030,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 OS_TARGET=linux
 override DEFAULT_FPCDIR=../..
 ifndef FPC
@@ -93,6 +109,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -267,6 +284,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -328,9 +346,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -454,11 +472,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -868,7 +888,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -900,7 +920,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -950,7 +970,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1023,8 +1043,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 OS_TARGET=os2
 CPU_TARGET=i386
 override DEFAULT_FPCDIR=../..
@@ -94,6 +110,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -253,6 +270,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -314,9 +332,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -440,11 +458,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -854,7 +874,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -886,7 +906,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -936,7 +956,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1009,8 +1029,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/12]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 OS_TARGET=win32
 override DEFAULT_FPCDIR=../..
 ifndef FPC
@@ -93,6 +109,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -257,6 +274,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -318,9 +336,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -444,11 +462,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -858,7 +878,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -940,7 +960,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1013,8 +1033,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: allexectests
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -230,6 +247,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -291,9 +309,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -417,11 +435,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -868,8 +888,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

tests/tbf/tb0118.pp

@@ -0,0 +1,8 @@
+{ %FAIL }
+
+procedure p(primo,primo:longint);
+begin
+end;
+
+begin
+end.

tests/tbf/tb0119.pp

@@ -0,0 +1,8 @@
+{ %FAIL }
+
+procedure p(const primo,primo:longint);
+begin
+end;
+
+begin
+end.

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -231,6 +248,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -292,9 +310,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -418,11 +436,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -736,6 +756,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -872,7 +897,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -904,7 +929,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -954,7 +979,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1027,8 +1052,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -179,8 +196,8 @@ else
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override PACKAGE_NAME=fputils
-override PACKAGE_VERSION=1.0.5
+override PACKAGE_NAME=utils
+override PACKAGE_VERSION=1.0.6
 override TARGET_DIRS+=fpcm tply h2pas fprcp dxegen
 override TARGET_PROGRAMS+=ppdep ptop rstconv data2inc delp bin2obj postw32
 override CLEAN_UNITS+=ptopu
@@ -235,6 +252,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -296,9 +314,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -436,11 +454,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -785,6 +805,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -806,6 +831,11 @@ UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)/$(OS_TARGET)
 else
 UNITDIR_PASZLIB=$(PACKAGEDIR_PASZLIB)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_PASZLIB)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_PASZLIB=
 UNITDIR_PASZLIB:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /paszlib/Package.fpc,$(UNITSDIR)))))
@@ -827,6 +857,11 @@ UNITDIR_INET=$(PACKAGEDIR_INET)/$(OS_TARGET)
 else
 UNITDIR_INET=$(PACKAGEDIR_INET)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_INET)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_INET=
 UNITDIR_INET:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /inet/Package.fpc,$(UNITSDIR)))))
@@ -848,6 +883,11 @@ UNITDIR_FCL=$(PACKAGEDIR_FCL)/$(OS_TARGET)
 else
 UNITDIR_FCL=$(PACKAGEDIR_FCL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_FCL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_FCL=
 UNITDIR_FCL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /fcl/Package.fpc,$(UNITSDIR)))))
@@ -869,6 +909,11 @@ UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)/$(OS_TARGET)
 else
 UNITDIR_MYSQL=$(PACKAGEDIR_MYSQL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_MYSQL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_MYSQL=
 UNITDIR_MYSQL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /mysql/Package.fpc,$(UNITSDIR)))))
@@ -890,6 +935,11 @@ UNITDIR_IBASE=$(PACKAGEDIR_IBASE)/$(OS_TARGET)
 else
 UNITDIR_IBASE=$(PACKAGEDIR_IBASE)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_IBASE)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_IBASE=
 UNITDIR_IBASE:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /ibase/Package.fpc,$(UNITSDIR)))))
@@ -1035,7 +1085,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1067,7 +1117,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -1117,7 +1167,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1269,8 +1319,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

utils/Makefile.fpc

@@ -3,8 +3,8 @@
 #
 
 [package]
-name=fputils
-version=1.0.5
+name=utils
+version=1.0.6
 
 [target]
 dirs=fpcm tply h2pas fprcp dxegen

utils/dxegen/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -234,6 +251,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -295,9 +313,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -421,11 +439,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -739,6 +759,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -878,7 +903,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -910,7 +935,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -960,7 +985,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1033,8 +1058,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)

utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/01/29]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -68,6 +68,22 @@ endif
 else
 BASEDIR=.
 endif
+ifdef inOS2
+ifndef ECHO
+ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
+ifeq ($(ECHO),)
+ECHO=echo
+else
+ECHO:=$(firstword $(ECHO))
+endif
+else
+ECHO:=$(firstword $(ECHO))
+endif
+endif
+export ECHO
+endif
 override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
@@ -92,6 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -232,6 +249,7 @@ endif
 endif
 endif
 export INSTALL_PREFIX
+export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -293,9 +311,9 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -419,11 +437,13 @@ PPUEXT=.ppo
 ASMEXT=.so2
 OEXT=.oo2
 AOUTEXT=.out
-SMARTEXT=.so
+SMARTEXT=.sl2
+STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
 FPCMADE=fpcmade.os2
 ZIPSUFFIX=emx
+ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
@@ -737,6 +757,11 @@ UNITDIR_RTL=$(PACKAGEDIR_RTL)/$(OS_TARGET)
 else
 UNITDIR_RTL=$(PACKAGEDIR_RTL)
 endif
+ifdef CHECKDEPEND
+$(PACKAGEDIR_RTL)/$(FPCMADE):
+	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
+override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+endif
 else
 PACKAGEDIR_RTL=
 UNITDIR_RTL:=$(subst /Package.fpc,,$(strip $(wildcard $(addsuffix /rtl/Package.fpc,$(UNITSDIR)))))
@@ -876,7 +901,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -908,7 +933,7 @@ ifdef INSTALL_UNITS
 override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
 endif
 ifdef INSTALL_BUILDUNIT
-override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT),$(INSTALLPPUFILES))
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
 endif
 ifdef INSTALLPPUFILES
 override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
@@ -958,7 +983,7 @@ ifdef INSTALL_FILES
 endif
 fpc_sourceinstall: distclean
 	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES
 	$(MKDIR) $(INSTALL_EXAMPLEDIR)
@@ -1031,8 +1056,8 @@ fpc_baseinfo:
 	@$(ECHO)  Target CPU... $(CPU_TARGET)
 	@$(ECHO)  Source OS.... $(OS_SOURCE)
 	@$(ECHO)  Target OS.... $(OS_TARGET)
-	@$(ECHO)  Full Target.. $(FULL_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Source.. $(FULL_SOURCE)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)