* souceinstall updates

utils/fpcm/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=
@@ -783,6 +803,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)))))
@@ -804,6 +829,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)))))
@@ -825,6 +855,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)))))
@@ -846,6 +881,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)))))
@@ -867,6 +907,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)))))
@@ -888,6 +933,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)))))
@@ -1033,7 +1083,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:
@@ -1065,7 +1115,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)))
@@ -1115,7 +1165,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)
@@ -1188,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_SOURCE)
-	@$(ECHO)  Full Source.. $(FULL_TARGET)
+	@$(ECHO)  Full Target.. $(FULL_TARGET)
 	@$(ECHO)
 	@$(ECHO)  == Directory info ==
 	@$(ECHO)