* Regenerated with updated fpcmake

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/03/11]
 #
 default: help
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -108,7 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
-unexport CHECKDEPEND ALL_DEPENDENCIES
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -664,7 +664,7 @@ ifndef ECHOREDIR
 ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
 endif
 ifndef COPY
-COPY:=-$(CPPROG) -fp
+COPY:=$(CPPROG) -fp
 endif
 ifndef COPYTREE
 COPYTREE:=$(CPPROG) -rfp
@@ -925,12 +925,78 @@ ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
+.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
+ifdef INSTALL_UNITS
+override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
+endif
+ifdef INSTALL_BUILDUNIT
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+endif
+ifdef INSTALLPPUFILES
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
+override INSTALL_CREATEPACKAGEFPC=1
+endif
+ifdef INSTALLEXEFILES
+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
+endif
+fpc_install: all $(INSTALLTARGET)
+ifdef INSTALLEXEFILES
+	$(MKDIR) $(INSTALL_BINDIR)
+ifdef UPXPROG
+	-$(UPXPROG) $(INSTALLEXEFILES)
+endif
+	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
+endif
+ifdef INSTALL_CREATEPACKAGEFPC
+ifdef FPCMAKE
+ifdef PACKAGE_VERSION
+ifneq ($(wildcard Makefile.fpc),)
+	$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+endif
+endif
+endif
+endif
+ifdef INSTALLPPUFILES
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
+ifneq ($(INSTALLPPULINKFILES),)
+	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
+endif
+ifneq ($(wildcard $(LIB_FULLNAME)),)
+	$(MKDIR) $(INSTALL_LIBDIR)
+	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
+ifdef inUnix
+	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
+endif
+endif
+endif
+ifdef INSTALL_FILES
+	$(MKDIR) $(INSTALL_DATADIR)
+	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
+endif
+fpc_sourceinstall: distclean
+	$(MKDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
+fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
+ifdef HASEXAMPLES
+	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
+	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef TARGET_EXAMPLEDIRS
+	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/fpc-pack
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
 PACKDIR=/tmp/fpc-pack
 endif
@@ -1508,8 +1574,8 @@ smart: $(addsuffix _smart,$(TARGET_DIRS))
 release: $(addsuffix _release,$(TARGET_DIRS))
 examples: $(addsuffix _examples,$(TARGET_DIRS))
 shared: $(addsuffix _shared,$(TARGET_DIRS))
-sourceinstall:
-exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
+sourceinstall: fpc_sourceinstall
+exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
 distinstall: fpc_distinstall
 zipsourceinstall: fpc_zipsourceinstall
 zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
@@ -1630,22 +1696,20 @@ ifdef IDE
 	$(NOSTOP)$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=ide$(ZIPSUFFIX)
 endif
 .PHONY: docspdf docs docsrcinstall docsrc
+DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs
 docspdf:
 	$(MAKE) -C docs pdfinstall
 docs:
 	$(MAKE) fpc_zipinstall ZIPTARGET=docspdf ZIPNAME=docs
 docsrcinstall:
 	$(MAKE) -C docs clean
-	$(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) docs $(INSTALL_SOURCEDIR)
+	$(MKDIR) $(DOCSOURCEDIR)
+	$(COPYTREE) docs/* $(DOCSOURCEDIR)
 docsrc:
 	$(MAKE) fpc_zipinstall ZIPTARGET=docsrcinstall ZIPNAME=docsrc
 .PHONY: demozip
 demozip:
-	$(MKDIR) $(PACKDIR)/source/demo
-	$(COPYTREE) ./demo/* $(PACKDIR)/source/demo
-	$(MAKE) -C demo demozip ZIPNAME=demo PACKDIR=$(PACKDIR)
-	$(DELTREE) $(PACKDIR)/source/demo
+	$(MAKE) -C demo zipsourceinstall ZIPNAME=demo
 .PHONY: sourcebase sourcezip
 INSTALL_BASESOURCEDIR=$(INSTALL_SOURCEDIR)/..
 sourcebase:

Makefile.fpc

@@ -328,6 +328,9 @@ endif
 
 .PHONY: docspdf docs docsrcinstall docsrc
 
+# We don't want the package name fpc in the path
+DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs
+
 docspdf:
         $(MAKE) -C docs pdfinstall
 
@@ -336,8 +339,8 @@ docs:
 
 docsrcinstall:
         $(MAKE) -C docs clean
-        $(MKDIR) $(INSTALL_SOURCEDIR)
-        $(COPYTREE) docs $(INSTALL_SOURCEDIR)
+        $(MKDIR) $(DOCSOURCEDIR)
+        $(COPYTREE) docs/* $(DOCSOURCEDIR)
 
 docsrc:
         $(MAKE) fpc_zipinstall ZIPTARGET=docsrcinstall ZIPNAME=docsrc
@@ -350,10 +353,7 @@ docsrc:
 .PHONY: demozip
 
 demozip:
-	$(MKDIR) $(PACKDIR)/source/demo
-	$(COPYTREE) ./demo/* $(PACKDIR)/source/demo
-	$(MAKE) -C demo demozip ZIPNAME=demo PACKDIR=$(PACKDIR)
-	$(DELTREE) $(PACKDIR)/source/demo
+	$(MAKE) -C demo zipsourceinstall ZIPNAME=demo
 
 
 ##########################################################################

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -322,7 +322,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -384,7 +383,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -833,7 +832,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -961,6 +960,72 @@ ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
+.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
+ifdef INSTALL_UNITS
+override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
+endif
+ifdef INSTALL_BUILDUNIT
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+endif
+ifdef INSTALLPPUFILES
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
+override INSTALL_CREATEPACKAGEFPC=1
+endif
+ifdef INSTALLEXEFILES
+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
+endif
+fpc_install: all $(INSTALLTARGET)
+ifdef INSTALLEXEFILES
+	$(MKDIR) $(INSTALL_BINDIR)
+ifdef UPXPROG
+	-$(UPXPROG) $(INSTALLEXEFILES)
+endif
+	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
+endif
+ifdef INSTALL_CREATEPACKAGEFPC
+ifdef FPCMAKE
+ifdef PACKAGE_VERSION
+ifneq ($(wildcard Makefile.fpc),)
+	$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+endif
+endif
+endif
+endif
+ifdef INSTALLPPUFILES
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
+ifneq ($(INSTALLPPULINKFILES),)
+	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
+endif
+ifneq ($(wildcard $(LIB_FULLNAME)),)
+	$(MKDIR) $(INSTALL_LIBDIR)
+	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
+ifdef inUnix
+	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
+endif
+endif
+endif
+ifdef INSTALL_FILES
+	$(MKDIR) $(INSTALL_DATADIR)
+	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
+endif
+fpc_sourceinstall: distclean
+	$(MKDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
+fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
+ifdef HASEXAMPLES
+	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
+	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef TARGET_EXAMPLEDIRS
+	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
@@ -1254,8 +1319,8 @@ smart: $(addsuffix _smart,$(TARGET_DIRS))
 release: $(addsuffix _release,$(TARGET_DIRS))
 examples: $(addsuffix _examples,$(TARGET_DIRS))
 shared: $(addsuffix _shared,$(TARGET_DIRS))
-sourceinstall:
-exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
+sourceinstall: fpc_sourceinstall
+exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
 distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall

compiler/new/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -309,7 +309,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -371,7 +370,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -820,7 +819,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -948,6 +947,72 @@ ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
+.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
+ifdef INSTALL_UNITS
+override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
+endif
+ifdef INSTALL_BUILDUNIT
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+endif
+ifdef INSTALLPPUFILES
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
+override INSTALL_CREATEPACKAGEFPC=1
+endif
+ifdef INSTALLEXEFILES
+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
+endif
+fpc_install: all $(INSTALLTARGET)
+ifdef INSTALLEXEFILES
+	$(MKDIR) $(INSTALL_BINDIR)
+ifdef UPXPROG
+	-$(UPXPROG) $(INSTALLEXEFILES)
+endif
+	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
+endif
+ifdef INSTALL_CREATEPACKAGEFPC
+ifdef FPCMAKE
+ifdef PACKAGE_VERSION
+ifneq ($(wildcard Makefile.fpc),)
+	$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+endif
+endif
+endif
+endif
+ifdef INSTALLPPUFILES
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
+ifneq ($(INSTALLPPULINKFILES),)
+	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
+endif
+ifneq ($(wildcard $(LIB_FULLNAME)),)
+	$(MKDIR) $(INSTALL_LIBDIR)
+	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
+ifdef inUnix
+	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
+endif
+endif
+endif
+ifdef INSTALL_FILES
+	$(MKDIR) $(INSTALL_DATADIR)
+	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
+endif
+fpc_sourceinstall: distclean
+	$(MKDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
+fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
+ifdef HASEXAMPLES
+	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
+	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef TARGET_EXAMPLEDIRS
+	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
@@ -1197,8 +1262,8 @@ smart:
 release:
 examples:
 shared:
-sourceinstall:
-exampleinstall:
+sourceinstall: fpc_sourceinstall
+exampleinstall: fpc_exampleinstall
 distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall

compiler/pstatmnt.pas

@@ -450,7 +450,7 @@ implementation
                if token<>_SEMICOLON then
                 right:=statement
                else
-                right:=nil;
+                right:=cerrornode.create;
              end;
             for i:=1 to levelcount do
              symtablestack:=symtablestack.next;
@@ -1222,7 +1222,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.47  2002-03-04 17:54:59  peter
+  Revision 1.48  2002-03-11 19:10:28  peter
+    * Regenerated with updated fpcmake
+
+  Revision 1.47  2002/03/04 17:54:59  peter
     * allow oridinal labels again
 
   Revision 1.46  2002/01/29 21:32:03  peter

compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -252,7 +252,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -314,7 +313,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -763,7 +762,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

demo/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/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -107,7 +107,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
-unexport CHECKDEPEND ALL_DEPENDENCIES
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -839,12 +839,78 @@ ifdef TARGET_RSTS
 override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
+.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
+ifdef INSTALL_UNITS
+override INSTALLPPUFILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))
+endif
+ifdef INSTALL_BUILDUNIT
+override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUEXT),$(INSTALLPPUFILES))
+endif
+ifdef INSTALLPPUFILES
+override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES)))
+override INSTALLPPUFILES:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPUFILES))
+override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLPPULINKFILES)))
+override INSTALL_CREATEPACKAGEFPC=1
+endif
+ifdef INSTALLEXEFILES
+override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEFILES))
+endif
+fpc_install: all $(INSTALLTARGET)
+ifdef INSTALLEXEFILES
+	$(MKDIR) $(INSTALL_BINDIR)
+ifdef UPXPROG
+	-$(UPXPROG) $(INSTALLEXEFILES)
+endif
+	$(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
+endif
+ifdef INSTALL_CREATEPACKAGEFPC
+ifdef FPCMAKE
+ifdef PACKAGE_VERSION
+ifneq ($(wildcard Makefile.fpc),)
+	$(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) Package.fpc $(INSTALL_UNITDIR)
+endif
+endif
+endif
+endif
+ifdef INSTALLPPUFILES
+	$(MKDIR) $(INSTALL_UNITDIR)
+	$(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
+ifneq ($(INSTALLPPULINKFILES),)
+	$(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)
+endif
+ifneq ($(wildcard $(LIB_FULLNAME)),)
+	$(MKDIR) $(INSTALL_LIBDIR)
+	$(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)
+ifdef inUnix
+	ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)
+endif
+endif
+endif
+ifdef INSTALL_FILES
+	$(MKDIR) $(INSTALL_DATADIR)
+	$(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)
+endif
+fpc_sourceinstall: distclean
+	$(MKDIR) $(INSTALL_SOURCEDIR)
+	$(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
+fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
+ifdef HASEXAMPLES
+	$(MKDIR) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef EXAMPLESOURCEFILES
+	$(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)
+endif
+ifdef TARGET_EXAMPLEDIRS
+	$(COPYTREE) $(addsuffix /*,$(TARGET_EXAMPLEDIRS)) $(INSTALL_EXAMPLEDIR)
+endif
 .PHONY: fpc_distinstall
 fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/fpc-pack
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
 PACKDIR=/tmp/fpc-pack
 endif
@@ -1343,9 +1409,9 @@ smart: $(addsuffix _smart,$(TARGET_DIRS))
 release: $(addsuffix _release,$(TARGET_DIRS))
 examples: $(addsuffix _examples,$(TARGET_DIRS))
 shared: $(addsuffix _shared,$(TARGET_DIRS))
-install: $(addsuffix _install,$(TARGET_DIRS))
-sourceinstall:
-exampleinstall: $(addsuffix _exampleinstall,$(TARGET_DIRS))
+install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
+sourceinstall: fpc_sourceinstall
+exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
 distinstall: fpc_distinstall
 zipinstall: fpc_zipinstall
 zipsourceinstall: fpc_zipsourceinstall
@@ -1364,24 +1430,4 @@ endif
 installexamples:
 	$(MKDIR) $(INSTALL_SOURCEDIR)
 	$(COPYTREE) * $(INSTALL_SOURCEDIR)
-demozip:
-	$(DEL) $(ZIPDESTFILE)
-ifdef USEZIPWRAPPER
-ifneq ($(ECHOREDIR),echo)
-	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER)
-	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)
-	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER)
-else
-	echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)
-	echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)
-	echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
-endif
-ifdef inUnix
-	/bin/sh $(ZIPWRAPPER)
-else
-	$(ZIPWRAPPER)
-endif
-	$(DEL) $(ZIPWRAPPER)
-else
-	$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
-endif
+demozip: zipsourceinstall

demo/Makefile.fpc

@@ -25,25 +25,6 @@ fpcpackage=y
 
 installexamples:
         $(MKDIR) $(INSTALL_SOURCEDIR)
-	$(COPYTREE) * $(INSTALL_SOURCEDIR)
-demozip:
-	$(DEL) $(ZIPDESTFILE)
-ifdef USEZIPWRAPPER
-ifneq ($(ECHOREDIR),echo)
-	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPER)
-	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIPWRAPPER)
-	$(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPPER)
-else
-	echo $(ZIPCMD_CDPACK) > $(ZIPWRAPPER)
-	echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)
-	echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
-endif
-ifdef inUnix
-	/bin/sh $(ZIPWRAPPER)
-else
-	$(ZIPWRAPPER)
-endif
-	$(DEL) $(ZIPWRAPPER)
-else
-	$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
-endif
+        $(COPYTREE) * $(INSTALL_SOURCEDIR)
+
+demozip: zipsourceinstall

demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -255,7 +255,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -317,7 +316,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -766,7 +765,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -249,7 +249,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,7 +310,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -760,7 +759,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -249,7 +249,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,7 +310,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -760,7 +759,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -247,7 +247,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -309,7 +308,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -758,7 +757,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -249,7 +249,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,7 +310,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -760,7 +759,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

fcl/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/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -108,7 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
-unexport CHECKDEPEND ALL_DEPENDENCIES
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -829,7 +829,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -855,7 +855,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_PASZLIB=
@@ -881,7 +881,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_INET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_INET=
@@ -907,7 +907,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -933,7 +933,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=
@@ -1092,7 +1092,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALL_DEPENDENCIES) $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1174,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)
@@ -1190,7 +1190,7 @@ fpc_distinstall: install exampleinstall
 .PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall
 ifndef PACKDIR
 ifndef inUnix
-PACKDIR=$(BASEDIR)/fpc-pack
+PACKDIR=$(BASEDIR)/../fpc-pack
 else
 PACKDIR=/tmp/fpc-pack
 endif

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -262,7 +262,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -324,7 +323,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -793,7 +792,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -819,7 +818,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -845,7 +844,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=

fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -252,7 +252,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -314,7 +313,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -763,7 +762,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

fcl/db/interbase/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/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -108,7 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
-unexport CHECKDEPEND ALL_DEPENDENCIES
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -788,7 +788,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -814,7 +814,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=
@@ -973,7 +973,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALL_DEPENDENCIES) $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1055,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)

fcl/db/mysql/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/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -108,7 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
-unexport CHECKDEPEND ALL_DEPENDENCIES
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -788,7 +788,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -814,7 +814,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -973,7 +973,7 @@ HASEXAMPLES=1
 endif
 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALL_DEPENDENCIES) $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1055,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)

fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -249,7 +249,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,7 +310,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -805,7 +804,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -831,7 +830,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_PASZLIB=
@@ -857,7 +856,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_INET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_INET=
@@ -883,7 +882,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FCL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FCL=
@@ -909,7 +908,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -935,7 +934,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -252,7 +252,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -314,7 +313,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -763,7 +762,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -249,7 +249,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,7 +310,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -830,7 +829,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -856,7 +855,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_PASZLIB=
@@ -882,7 +881,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_INET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_INET=
@@ -908,7 +907,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FCL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FCL=
@@ -934,7 +933,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_GTK)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_GTK) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_GTK=
@@ -960,7 +959,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -986,7 +985,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=
@@ -1012,7 +1011,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_X11)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_X11=
@@ -1038,7 +1037,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_OPENGL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_OPENGL=

fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -255,7 +255,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -317,7 +316,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -811,7 +810,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -837,7 +836,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_PASZLIB=
@@ -863,7 +862,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_INET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_INET=
@@ -889,7 +888,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FCL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FCL=
@@ -915,7 +914,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -941,7 +940,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

fv/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -254,7 +254,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -316,7 +315,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -765,7 +764,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

fv/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -247,7 +247,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -309,7 +308,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -769,7 +768,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -795,7 +794,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FV)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FV=

fvision/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -254,7 +254,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -316,7 +315,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -765,7 +764,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

fvision/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -247,7 +247,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -309,7 +308,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -769,7 +768,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -795,7 +794,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FV)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FV=

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -301,7 +301,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -363,7 +362,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -859,7 +858,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -885,7 +884,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FV)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FV=
@@ -911,7 +910,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_GDBINT)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_GDBINT) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_GDBINT)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_GDBINT)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_GDBINT=
@@ -937,7 +936,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_REGEXPR)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_REGEXPR) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_REGEXPR)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_REGEXPR)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_REGEXPR=

ide/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -262,7 +262,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -324,7 +323,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -773,7 +772,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

ide/fakegdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -248,7 +248,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -310,7 +309,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -759,7 +758,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

installer/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -266,7 +266,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -328,7 +327,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -799,7 +798,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -825,7 +824,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FV)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FV) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FV)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FV=
@@ -851,7 +850,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_UNZIP)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_UNZIP) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_UNZIP)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_UNZIP)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_UNZIP=

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -248,7 +248,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -310,7 +309,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

packages/base/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -263,7 +263,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -325,7 +324,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

packages/base/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -253,7 +253,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -315,7 +314,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -778,7 +777,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/base/gdbint/libgdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -245,7 +245,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -307,7 +306,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

packages/base/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/base/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/base/libasync/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -257,7 +257,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -319,7 +318,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -768,7 +767,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/base/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/base/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/base/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -249,7 +249,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,7 +310,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -816,7 +815,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -842,7 +841,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_ORACLE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_ORACLE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_ORACLE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_ORACLE=
@@ -868,7 +867,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_PASZLIB=
@@ -894,7 +893,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_INET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_INET=
@@ -920,7 +919,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FCL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FCL=
@@ -946,7 +945,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -972,7 +971,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=

packages/base/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/base/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/base/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -252,7 +252,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -314,7 +313,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -763,7 +762,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -265,7 +265,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -327,7 +326,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

packages/extra/bfd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -761,7 +760,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/cmem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -252,7 +252,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -314,7 +313,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -788,7 +787,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -814,7 +813,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_X11)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_X11=

packages/extra/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -248,7 +248,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -310,7 +309,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -795,7 +794,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -821,7 +820,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_X11)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_X11=
@@ -847,7 +846,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FORMS)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FORMS) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FORMS)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FORMS)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FORMS=

packages/extra/fpasync/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/01]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -108,7 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
-unexport CHECKDEPEND ALL_DEPENDENCIES
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE
@@ -325,7 +325,7 @@ else
 ifdef INSTALL_FPCPACKAGE
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
-INSTALL_SOURCEDIRL:=$(INSTALL_BASEDIR)/source
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
 endif
 endif
@@ -828,7 +828,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -854,7 +854,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_PASZLIB=
@@ -880,7 +880,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_INET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_INET=
@@ -906,7 +906,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FCL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FCL=
@@ -932,7 +932,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_LIBASYNC)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_LIBASYNC) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_LIBASYNC)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_LIBASYNC)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_LIBASYNC=
@@ -958,7 +958,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -984,7 +984,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=
@@ -1128,7 +1128,7 @@ override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
 override CLEANRSTFILES+=$(RSTFILES)
 endif
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
-$(FPCMADE): $(ALL_DEPENDENCIES) $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
 	@$(ECHOREDIR) Compiled > $(FPCMADE)
 fpc_all: $(FPCMADE)
 fpc_smart:
@@ -1210,7 +1210,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)

packages/extra/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -254,7 +254,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -316,7 +315,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -793,7 +792,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -819,7 +818,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_X11)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_X11=
@@ -845,7 +844,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_OPENGL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_OPENGL=

packages/extra/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -800,7 +799,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -826,7 +825,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_GTK)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_GTK) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_GTK=
@@ -852,7 +851,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_X11)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_X11=
@@ -878,7 +877,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_OPENGL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_OPENGL=

packages/extra/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -247,7 +247,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -309,7 +308,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -786,7 +785,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_GTK)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_GTK) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_GTK)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_GTK=
@@ -812,7 +811,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_X11)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_X11=
@@ -838,7 +837,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_OPENGL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_OPENGL=

packages/extra/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -790,7 +789,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -816,7 +815,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_X11)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_X11) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_X11)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_X11=
@@ -842,7 +841,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_OPENGL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_OPENGL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_OPENGL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_OPENGL=

packages/extra/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -786,7 +785,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -812,7 +811,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_ZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_ZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_ZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_ZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_ZLIB=

packages/extra/mmsystem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -761,7 +760,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/numlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -761,7 +760,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/syslog/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -776,7 +775,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/unzip/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -253,7 +253,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -315,7 +314,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -764,7 +763,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/x11/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -775,7 +774,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

packages/extra/zlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -775,7 +774,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

rtl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -271,7 +271,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -333,7 +332,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/amiga/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -271,7 +271,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -333,7 +332,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/beos/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -266,7 +266,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -328,7 +327,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/freebsd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -278,7 +278,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -340,7 +339,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -264,7 +264,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -326,7 +325,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -271,7 +271,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -333,7 +332,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/go32v2/system.pp

@@ -1389,6 +1389,8 @@ end;
 
 procedure rmdir(const s : string);[IOCheck];
 begin
+  if (s = '.' ) then
+    InOutRes := 16;
   If (s='') or (InOutRes <> 0) then
    exit;
   DosDir($3a,s);
@@ -1562,7 +1564,10 @@ Begin
 End.
 {
   $Log$
-  Revision 1.14  2001-10-28 17:43:51  peter
+  Revision 1.15  2002-03-11 19:10:33  peter
+    * Regenerated with updated fpcmake
+
+  Revision 1.14  2001/10/28 17:43:51  peter
     * add trtlcriticalsection type
 
   Revision 1.13  2001/08/12 17:57:54  peter

rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -284,7 +284,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -346,7 +345,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -270,7 +270,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -332,7 +331,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/os2/system.pas

@@ -786,6 +786,8 @@ procedure rmdir(const s : string);[IOCHECK];
 var buffer:array[0..255] of char;
     Rc : word;
 begin
+  if (s = '.' ) then
+    InOutRes := 16;
   If (s='') or (InOutRes <> 0) then
    exit;
   if os_mode = osOs2 then
@@ -1073,7 +1075,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.18  2002-02-10 13:46:20  hajny
+  Revision 1.19  2002-03-11 19:10:33  peter
+    * Regenerated with updated fpcmake
+
+  Revision 1.18  2002/02/10 13:46:20  hajny
     * heap management corrected (heap_brk)
 
   Revision 1.17  2001/11/15 18:49:43  hajny

rtl/unix/errno.inc

@@ -13,141 +13,217 @@
 
  **********************************************************************}
 {
- 
-  Errno.inc : define all error numbers, kernel version 1.2.13 
+
+  Errno.inc : define all error numbers, kernel version 1.2.13
 
 }
-Const 
+Const
+
+Sys_EPERM       = 1;    { Operation not permitted }
+Sys_ENOENT      = 2;    { No such file or directory }
+Sys_ESRCH       = 3;    { No such process }
+Sys_EINTR       = 4;    { Interrupted system call }
+Sys_EIO = 5;    { I/O error }
+Sys_ENXIO       = 6;    { No such device or address }
+Sys_E2BIG       = 7;    { Arg list too long }
+Sys_ENOEXEC     = 8;    { Exec format error }
+Sys_EBADF       = 9;    { Bad file number }
+Sys_ECHILD      = 10;   { No child processes }
+{$ifdef FreeBSD}
+Sys_EDEADLK     = 11;   { Deadlock avoided}
+{$else}
+Sys_EAGAIN      = 11;   { Try again }
+{$endif}
+Sys_ENOMEM      = 12;   { Out of memory }
+Sys_EACCES      = 13;   { Permission denied }
+Sys_EFAULT      = 14;   { Bad address }
+Sys_ENOTBLK     = 15;   { Block device required, NOT POSIX! }
+Sys_EBUSY       = 16;   { Device or resource busy }
+Sys_EEXIST      = 17;   { File exists }
+Sys_EXDEV       = 18;   { Cross-device link }
+Sys_ENODEV      = 19;   { No such device }
+Sys_ENOTDIR     = 20;   { Not a directory }
+Sys_EISDIR      = 21;   { Is a directory }
+Sys_EINVAL      = 22;   { Invalid argument }
+Sys_ENFILE      = 23;   { File table overflow }
+Sys_EMFILE      = 24;   { Too many open files }
+Sys_ENOTTY      = 25;   { Not a typewriter }
+Sys_ETXTBSY     = 26;   { Text file busy }
+Sys_EFBIG       = 27;   { File too large }
+Sys_ENOSPC      = 28;   { No space left on device }
+Sys_ESPIPE      = 29;   { Illegal seek }
+Sys_EROFS       = 30;   { Read-only file system }
+Sys_EMLINK      = 31;   { Too many links }
+Sys_EPIPE       = 32;   { Broken pipe }
+Sys_EDOM        = 33;   { Math argument out of domain of func }
+Sys_ERANGE      = 34;   { Math result not representable }
+{$ifdef FreeBSD}
+{ non-blocking and interrupt i/o }
+Sys_EAGAIN      = 35;           { Resource temporarily unavailable }
+
+// non posix from here on.
+
+Sys_EWOULDBLOCK = SYS_EAGAIN;   { Operation would block }
+Sys_EINPROGRESS = 36;   { Operation now in progress }
+Sys_EALREADY    = 37;   { Operation already in progress }
 
-Sys_EPERM	= 1;	{ Operation not permitted }
-Sys_ENOENT	= 2;	{ No such file or directory }
-Sys_ESRCH	= 3;	{ No such process }
-Sys_EINTR	= 4;	{ Interrupted system call }
-Sys_EIO	= 5;	{ I/O error }
-Sys_ENXIO	= 6;	{ No such device or address }
-Sys_E2BIG	= 7;	{ Arg list too long }
-Sys_ENOEXEC	= 8;	{ Exec format error }
-Sys_EBADF	= 9;	{ Bad file number }
-Sys_ECHILD	= 10;	{ No child processes }
-Sys_EAGAIN	= 11;	{ Try again }
-Sys_ENOMEM	= 12;	{ Out of memory }
-Sys_EACCES	= 13;	{ Permission denied }
-Sys_EFAULT	= 14;	{ Bad address }
-Sys_ENOTBLK	= 15;	{ Block device required }
-Sys_EBUSY	= 16;	{ Device or resource busy }
-Sys_EEXIST	= 17;	{ File exists }
-Sys_EXDEV	= 18;	{ Cross-device link }
-Sys_ENODEV	= 19;	{ No such device }
-Sys_ENOTDIR	= 20;	{ Not a directory }
-Sys_EISDIR	= 21;	{ Is a directory }
-Sys_EINVAL	= 22;	{ Invalid argument }
-Sys_ENFILE	= 23;	{ File table overflow }
-Sys_EMFILE	= 24;	{ Too many open files }
-Sys_ENOTTY	= 25;	{ Not a typewriter }
-Sys_ETXTBSY	= 26;	{ Text file busy }
-Sys_EFBIG	= 27;	{ File too large }
-Sys_ENOSPC	= 28;	{ No space left on device }
-Sys_ESPIPE	= 29;	{ Illegal seek }
-Sys_EROFS	= 30;	{ Read-only file system }
-Sys_EMLINK	= 31;	{ Too many links }
-Sys_EPIPE	= 32;	{ Broken pipe }
-Sys_EDOM	= 33;	{ Math argument out of domain of func }
-Sys_ERANGE	= 34;	{ Math result not representable }
-Sys_EDEADLK	= 35;	{ Resource deadlock would occur }
-Sys_ENAMETOOLONG= 36;	{ File name too long }
-Sys_ENOLCK	= 37;	{ No record locks available }
-Sys_ENOSYS	= 38;	{ Function not implemented }
-Sys_ENOTEMPTY= 39;	{ Directory not empty }
-Sys_ELOOP	= 40;	{ Too many symbolic links encountered }
-Sys_EWOULDBLOCK	= Sys_EAGAIN;	{ Operation would block }
-Sys_ENOMSG	= 42;	{ No message of desired type }
-Sys_EIDRM	= 43;	{ Identifier removed }
-Sys_ECHRNG	= 44;	{ Channel number out of range }
-Sys_EL2NSYNC= 45;	{ Level 2 not synchronized }
-Sys_EL3HLT	= 46;	{ Level 3 halted }
-Sys_EL3RST	= 47;	{ Level 3 reset }
-Sys_ELNRNG	= 48;	{ Link number out of range }
-Sys_EUNATCH	= 49;	{ Protocol driver not attached }
-Sys_ENOCSI	= 50;	{ No CSI structure available }
-Sys_EL2HLT	= 51;	{ Level 2 halted }
-Sys_EBADE	= 52;	{ Invalid exchange }
-Sys_EBADR	= 53;	{ Invalid request descriptor }
-Sys_EXFULL	= 54;	{ Exchange full }
-Sys_ENOANO	= 55;	{ No anode }
-Sys_EBADRQC	= 56;	{ Invalid request code }
-Sys_EBADSLT	= 57;	{ Invalid slot }
-Sys_EDEADLOCK= 58;	{ File locking deadlock error }
-Sys_EBFONT	= 59;	{ Bad font file format }
-Sys_ENOSTR	= 60;	{ Device not a stream }
-Sys_ENODATA	= 61;	{ No data available }
-Sys_ETIME	= 62;	{ Timer expired }
-Sys_ENOSR	= 63;	{ Out of streams resources }
-Sys_ENONET	= 64;	{ Machine is not on the network }
-Sys_ENOPKG	= 65;	{ Package not installed }
-Sys_EREMOTE	= 66;	{ Object is remote }
-Sys_ENOLINK	= 67;	{ Link has been severed }
-Sys_EADV	= 68;	{ Advertise error }
-Sys_ESRMNT	= 69;	{ Srmount error }
-Sys_ECOMM	= 70;	{ Communication error on send }
-Sys_EPROTO	= 71;	{ Protocol error }
-Sys_EMULTIHOP= 72;	{ Multihop attempted }
-Sys_EDOTDOT	= 73;	{ RFS specific error }
-Sys_EBADMSG	= 74;	{ Not a data message }
-Sys_EOVERFLOW= 75;	{ Value too large for defined data type }
-Sys_ENOTUNIQ= 76;	{ Name not unique on network }
-Sys_EBADFD	= 77;	{ File descriptor in bad state }
-Sys_EREMCHG	= 78;	{ Remote address changed }
-Sys_ELIBACC	= 79;	{ Can not access a needed shared library }
-Sys_ELIBBAD	= 80;	{ Accessing a corrupted shared library }
-Sys_ELIBSCN	= 81;	{ .lib section in a.out corrupted }
-Sys_ELIBMAX	= 82;	{ Attempting to link in too many shared libraries }
-Sys_ELIBEXEC= 83;	{ Cannot exec a shared library directly }
-Sys_EILSEQ	= 84;	{ Illegal byte sequence }
-Sys_ERESTART= 85;	{ Interrupted system call should be restarted }
-Sys_ESTRPIPE= 86;	{ Streams pipe error }
-Sys_EUSERS	= 87;	{ Too many users }
-Sys_ENOTSOCK= 88;	{ Socket operation on non-socket }
-Sys_EDESTADDRREQ= 89;	{ Destination address required }
-Sys_EMSGSIZE= 90;	{ Message too long }
-Sys_EPROTOTYPE= 91;	{ Protocol wrong type for socket }
-Sys_ENOPROTOOPT= 92;	{ Protocol not available }
-Sys_EPROTONOSUPPORT= 93;	{ Protocol not supported }
-Sys_ESOCKTNOSUPPORT= 94;	{ Socket type not supported }
-Sys_EOPNOTSUPP= 95;	{ Operation not supported on transport endpoint }
-Sys_EPFNOSUPPORT= 96;	{ Protocol family not supported }
-Sys_EAFNOSUPPORT= 97;	{ Address family not supported by protocol }
-Sys_EADDRINUSE= 98;	{ Address already in use }
-Sys_EADDRNOTAVAIL= 99;	{ Cannot assign requested address }
-Sys_ENETDOWN= 100;	{ Network is down }
-Sys_ENETUNREACH= 101;	{ Network is unreachable }
-Sys_ENETRESET= 102;	{ Network dropped connection because of reset }
-Sys_ECONNABORTED= 103;	{ Software caused connection abort }
-Sys_ECONNRESET= 104;	{ Connection reset by peer }
-Sys_ENOBUFS	= 105;	{ No buffer space available }
-Sys_EISCONN	= 106;	{ Transport endpoint is already connected }
-Sys_ENOTCONN= 107;	{ Transport endpoint is not connected }
-Sys_ESHUTDOWN= 108;	{ Cannot send after transport endpoint shutdown }
-Sys_ETOOMANYREFS= 109;	{ Too many references: cannot splice }
-Sys_ETIMEDOUT= 110;	{ Connection timed out }
-Sys_ECONNREFUSED= 111;	{ Connection refused }
-Sys_EHOSTDOWN= 112;	{ Host is down }
-Sys_EHOSTUNREACH= 113;	{ No route to host }
-Sys_EALREADY= 114;	{ Operation already in progress }
-Sys_EINPROGRESS= 115;	{ Operation now in progress }
-Sys_ESTALE	= 116;	{ Stale NFS file handle }
-Sys_EUCLEAN	= 117;	{ Structure needs cleaning }
-Sys_ENOTNAM	= 118;	{ Not a XENIX named type file }
-Sys_ENAVAIL	= 119;	{ No XENIX semaphores available }
-Sys_EISNAM	= 120;	{ Is a named type file }
-Sys_EREMOTEIO= 121;	{ Remote I/O error }
-Sys_EDQUOT	= 122;	{ Quota exceeded }
+{ ipc/network software -- argument errors }
+Sys_ENOTSOCK    = 38;   { Socket operation on non-socket }
+Sys_EDESTADDRREQ= 39;   { Destination address required }
+Sys_EMSGSIZE    = 40;   { Message too long }
+Sys_EPROTOTYPE  = 41;   { Protocol wrong type for socket }
+Sys_ENOPROTOOPT = 42;   { Protocol not available }
+Sys_EPROTONOSUPPORT= 43;{ Protocol not supported }
+Sys_ESOCKTNOSUPPORT= 44;{ Socket type not supported }
+Sys_EOPNOTSUPP  = 45;   { Operation not supported }
+Sys_ENOTSUP     = SYS_EOPNOTSUPP;       { Operation not supported }
+Sys_EPFNOSUPPORT= 46;   { Protocol family not supported }
+Sys_EAFNOSUPPORT= 47;   { Address family not supported by protocol family }
+Sys_EADDRINUSE  = 48;   { Address already in use }
+Sys_EADDRNOTAVAIL= 49;  { Can't assign requested address }
+
+{ ipc/network software -- operational errors }
+Sys_ENETDOWN    = 50;   { Network is down }
+Sys_ENETUNREACH = 51;   { Network is unreachable }
+Sys_ENETRESET   = 52;   { Network dropped connection on reset }
+Sys_ECONNABORTED= 53;   { Software caused connection abort }
+Sys_ECONNRESET  = 54;   { Connection reset by peer }
+Sys_ENOBUFS     = 55;   { No buffer space available }
+Sys_EISCONN     = 56;   { Socket is already connected }
+Sys_ENOTCONN    = 57;   { Socket is not connected }
+Sys_ESHUTDOWN   = 58;   { Can't send after socket shutdown }
+Sys_ETOOMANYREFS= 59;   { Too many references: can't splice }
+Sys_ETIMEDOUT   = 60;   { Operation timed out }
+Sys_ECONNREFUSED= 61;   { Connection refused }
+Sys_ELOOP       = 62;   { Too many levels of symbolic links }
+Sys_ENAMETOOLONG= 63;   { File name too long }
+Sys_EHOSTDOWN   = 64;   { Host is down }
+Sys_EHOSTUNREACH= 65;   { No route to host }
+Sys_ENOTEMPTY   = 66;   { Directory not empty }
+{ quotas & mush }
+Sys_EPROCLIM    = 67;   { Too many processes }
+Sys_EUSERS      = 68;   { Too many users }
+Sys_EDQUOT      = 69;   { Disc quota exceeded }
+{ Network File System }
+Sys_ESTALE      = 70;   { Stale NFS file handle }
+Sys_EREMOTE     = 71;   { Too many levels of remote in path }
+Sys_EBADRPC     = 72;   { RPC struct is bad }
+Sys_ERPCMISMATCH= 73;   { RPC version wrong }
+Sys_EPROGUNAVAIL= 74;   { RPC prog. not avail }
+Sys_EPROGMISMATCH= 75;  { Program version wrong }
+Sys_EPROCUNAVAIL= 76;   { Bad procedure for program }
+Sys_ENOLCK      = 77;   { No locks available }
+Sys_ENOSYS      = 78;   { Function not implemented }
+Sys_EFTYPE      = 79;   { Inappropriate file type or format }
+Sys_EAUTH       = 80;   { Authentication error }
+Sys_ENEEDAUTH   = 81;   { Need authenticator }
+Sys_EIDRM       = 82;   { Identifier removed }
+Sys_ENOMSG      = 83;   { No message of desired type }
+Sys_EOVERFLOW   = 84;   { Value too large to be stored in data type }
+Sys_ECANCELED   = 85;   { Operation canceled }
+Sys_EILSEQ      = 86;   { Illegal byte sequence }
+Sys_ELAST       = 86;   { Must be equal largest errno }
+
+{$else}
+Sys_EDEADLK     = 35;   { Resource deadlock would occur }
+Sys_ENAMETOOLONG= 36;   { File name too long }
+Sys_ENOLCK      = 37;   { No record locks available }
+Sys_ENOSYS      = 38;   { Function not implemented }
+Sys_ENOTEMPTY= 39;      { Directory not empty }
+Sys_ELOOP       = 40;   { Too many symbolic links encountered }
+Sys_EWOULDBLOCK = Sys_EAGAIN;   { Operation would block }
+Sys_ENOMSG      = 42;   { No message of desired type }
+Sys_EIDRM       = 43;   { Identifier removed }
+Sys_ECHRNG      = 44;   { Channel number out of range }
+Sys_EL2NSYNC= 45;       { Level 2 not synchronized }
+Sys_EL3HLT      = 46;   { Level 3 halted }
+Sys_EL3RST      = 47;   { Level 3 reset }
+Sys_ELNRNG      = 48;   { Link number out of range }
+Sys_EUNATCH     = 49;   { Protocol driver not attached }
+Sys_ENOCSI      = 50;   { No CSI structure available }
+Sys_EL2HLT      = 51;   { Level 2 halted }
+Sys_EBADE       = 52;   { Invalid exchange }
+Sys_EBADR       = 53;   { Invalid request descriptor }
+Sys_EXFULL      = 54;   { Exchange full }
+Sys_ENOANO      = 55;   { No anode }
+Sys_EBADRQC     = 56;   { Invalid request code }
+Sys_EBADSLT     = 57;   { Invalid slot }
+Sys_EDEADLOCK= 58;      { File locking deadlock error }
+Sys_EBFONT      = 59;   { Bad font file format }
+Sys_ENOSTR      = 60;   { Device not a stream }
+Sys_ENODATA     = 61;   { No data available }
+Sys_ETIME       = 62;   { Timer expired }
+Sys_ENOSR       = 63;   { Out of streams resources }
+Sys_ENONET      = 64;   { Machine is not on the network }
+Sys_ENOPKG      = 65;   { Package not installed }
+Sys_EREMOTE     = 66;   { Object is remote }
+Sys_ENOLINK     = 67;   { Link has been severed }
+Sys_EADV        = 68;   { Advertise error }
+Sys_ESRMNT      = 69;   { Srmount error }
+Sys_ECOMM       = 70;   { Communication error on send }
+Sys_EPROTO      = 71;   { Protocol error }
+Sys_EMULTIHOP= 72;      { Multihop attempted }
+Sys_EDOTDOT     = 73;   { RFS specific error }
+Sys_EBADMSG     = 74;   { Not a data message }
+Sys_EOVERFLOW= 75;      { Value too large for defined data type }
+Sys_ENOTUNIQ= 76;       { Name not unique on network }
+Sys_EBADFD      = 77;   { File descriptor in bad state }
+Sys_EREMCHG     = 78;   { Remote address changed }
+Sys_ELIBACC     = 79;   { Can not access a needed shared library }
+Sys_ELIBBAD     = 80;   { Accessing a corrupted shared library }
+Sys_ELIBSCN     = 81;   { .lib section in a.out corrupted }
+Sys_ELIBMAX     = 82;   { Attempting to link in too many shared libraries }
+Sys_ELIBEXEC= 83;       { Cannot exec a shared library directly }
+Sys_EILSEQ      = 84;   { Illegal byte sequence }
+Sys_ERESTART= 85;       { Interrupted system call should be restarted }
+Sys_ESTRPIPE= 86;       { Streams pipe error }
+Sys_EUSERS      = 87;   { Too many users }
+Sys_ENOTSOCK= 88;       { Socket operation on non-socket }
+Sys_EDESTADDRREQ= 89;   { Destination address required }
+Sys_EMSGSIZE= 90;       { Message too long }
+Sys_EPROTOTYPE= 91;     { Protocol wrong type for socket }
+Sys_ENOPROTOOPT= 92;    { Protocol not available }
+Sys_EPROTONOSUPPORT= 93;        { Protocol not supported }
+Sys_ESOCKTNOSUPPORT= 94;        { Socket type not supported }
+Sys_EOPNOTSUPP= 95;     { Operation not supported on transport endpoint }
+Sys_EPFNOSUPPORT= 96;   { Protocol family not supported }
+Sys_EAFNOSUPPORT= 97;   { Address family not supported by protocol }
+Sys_EADDRINUSE= 98;     { Address already in use }
+Sys_EADDRNOTAVAIL= 99;  { Cannot assign requested address }
+Sys_ENETDOWN= 100;      { Network is down }
+Sys_ENETUNREACH= 101;   { Network is unreachable }
+Sys_ENETRESET= 102;     { Network dropped connection because of reset }
+Sys_ECONNABORTED= 103;  { Software caused connection abort }
+Sys_ECONNRESET= 104;    { Connection reset by peer }
+Sys_ENOBUFS     = 105;  { No buffer space available }
+Sys_EISCONN     = 106;  { Transport endpoint is already connected }
+Sys_ENOTCONN= 107;      { Transport endpoint is not connected }
+Sys_ESHUTDOWN= 108;     { Cannot send after transport endpoint shutdown }
+Sys_ETOOMANYREFS= 109;  { Too many references: cannot splice }
+Sys_ETIMEDOUT= 110;     { Connection timed out }
+Sys_ECONNREFUSED= 111;  { Connection refused }
+Sys_EHOSTDOWN= 112;     { Host is down }
+Sys_EHOSTUNREACH= 113;  { No route to host }
+Sys_EALREADY= 114;      { Operation already in progress }
+Sys_EINPROGRESS= 115;   { Operation now in progress }
+Sys_ESTALE      = 116;  { Stale NFS file handle }
+Sys_EUCLEAN     = 117;  { Structure needs cleaning }
+Sys_ENOTNAM     = 118;  { Not a XENIX named type file }
+Sys_ENAVAIL     = 119;  { No XENIX semaphores available }
+Sys_EISNAM      = 120;  { Is a named type file }
+Sys_EREMOTEIO= 121;     { Remote I/O error }
+Sys_EDQUOT      = 122;  { Quota exceeded }
+{$endif}
 
 {
   $Log$
-  Revision 1.2  2000-09-18 13:14:50  marco
+  Revision 1.3  2002-03-11 19:10:33  peter
+    * Regenerated with updated fpcmake
+
+  Revision 1.2  2000/09/18 13:14:50  marco
    * Global Linux +bsd to (rtl/freebsd rtl/unix rtl/linux structure)
 
   Revision 1.2  2000/07/13 11:33:48  michael
   + removed logs
- 
+
 }

rtl/unix/sysunix.inc

@@ -218,6 +218,7 @@ begin
     Sys_EROFS,
    Sys_EEXIST,
    Sys_EISDIR,
+   Sys_ENOTEMPTY,
    Sys_EACCES : Inoutres:=5;
   Sys_ETXTBSY : Inoutres:=162;
   else
@@ -234,12 +235,37 @@ End;
 
 
 Procedure Do_Erase(p:pchar);
+{$ifdef BSD}
+ var FileInfo : Stat;
+{$endif}
+
 Begin
+  {$ifdef BSD} {or POSIX}
+  { verify if the filename is actually a directory }
+  { if so return error and do nothing, as defined  }
+  { by POSIX                                       }
+  if sys_stat(p,fileinfo)<0 then
+   begin
+     Errno2Inoutres;
+     exit;
+   end;
+  {$ifdef BSD}
+   if (fileinfo.mode and STAT_IFMT)=STAT_IFDIR then
+  {$else}
+   if s_ISDIR(fileinfo.st_mode) then
+  {$endif}
+   begin
+     InOutRes := 2;
+     exit;
+   end;
+  {$endif}
   sys_unlink(p);
   Errno2Inoutres;
+  {$ifdef Linux}
   { tp compatible result }
   if (Errno=Sys_EISDIR) then
    InOutRes:=2;
+  {$endif}
 End;
 
 
@@ -442,11 +468,18 @@ Procedure RmDir(Const s: String);[IOCheck];
 Var
   Buffer: Array[0..255] of Char;
 Begin
+  if (s ='.') then
+    InOutRes := 16;
   If (s='') or (InOutRes <> 0) then
    exit;
   Move(s[1], Buffer, Length(s));
   Buffer[Length(s)] := #0;
   sys_rmdir(@buffer);
+  {$ifdef BSD}
+    if (Errno=Sys_EINVAL) Then
+     InOutRes:=5
+    Else
+   {$endif}
   Errno2Inoutres;
 End;
 
@@ -731,7 +764,10 @@ End.
 
 {
   $Log$
-  Revision 1.18  2001-10-14 13:33:21  peter
+  Revision 1.19  2002-03-11 19:10:33  peter
+    * Regenerated with updated fpcmake
+
+  Revision 1.18  2001/10/14 13:33:21  peter
     * start of thread support for linux
 
   Revision 1.17  2001/09/30 21:10:20  peter

rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -274,7 +274,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -336,7 +335,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif

rtl/win32/system.pp

@@ -654,6 +654,8 @@ end;
 
 procedure rmdir(const s:string);[IOCHECK];
 begin
+  if (s ='.') then
+    InOutRes := 16;
   If (s='') or (InOutRes <> 0) then
    exit;
   dirfn(TDirFnType(@RemoveDirectory),s);
@@ -1583,7 +1585,10 @@ end.
 
 {
   $Log$
-  Revision 1.24  2002-01-30 14:57:11  pierre
+  Revision 1.25  2002-03-11 19:10:33  peter
+    * Regenerated with updated fpcmake
+
+  Revision 1.24  2002/01/30 14:57:11  pierre
    * fix compilation failure
 
   Revision 1.23  2002/01/25 16:23:03  peter

tests/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/03/11]
 #
 default: allexectests
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -108,7 +108,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif
 export FPC FPC_VERSION
-unexport CHECKDEPEND ALL_DEPENDENCIES
+unexport CHECKDEPEND ALLDEPENDENCIES
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)
 ifndef CPU_SOURCE

tests/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -248,7 +248,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -310,7 +309,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -759,7 +758,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -252,7 +252,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -314,7 +313,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -808,7 +807,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -834,7 +833,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_PASZLIB=
@@ -860,7 +859,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_INET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_INET=
@@ -886,7 +885,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FCL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FCL=
@@ -912,7 +911,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -938,7 +937,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=

utils/dxegen/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

utils/fpcm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -806,7 +805,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=
@@ -832,7 +831,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_PASZLIB)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_PASZLIB) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_PASZLIB)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_PASZLIB=
@@ -858,7 +857,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_INET)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_INET) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_INET)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_INET=
@@ -884,7 +883,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_FCL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_FCL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_FCL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_FCL=
@@ -910,7 +909,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_MYSQL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_MYSQL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_MYSQL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_MYSQL=
@@ -936,7 +935,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_IBASE)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_IBASE) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_IBASE)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_IBASE=

utils/fpcm/fpcmake.inc

@@ -176,15 +176,15 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'export FPC FPC_VERSION'#010+
   '# CHECKDEPEND should not be exported'#010+
   '# This should limit multiple checks'#010+
-  'unexport CHECKDEPEND ALL_DEPENDENCIES'#010+
+  'unexport CHECKDEPEND ALLDEPENDENCIES'#010+
   #010+
-  '##########','##########################################################'+
+  '###########','#########################################################'+
   '#'#010+
   '# FPC Target Detection'#010+
   '#####################################################################'#010+
   #010+
   '# For 1.1 and up we can use a single compiler call to retrieve'#010+
-  '# all needed informatio','n'#010+
+  '# all needed information',#010+
   'ifeq ($(findstring 1.0.,$(FPC_VERSION)),)'#010+
   #010+
   'COMPILERINFO:=$(shell $(FPC) -iSP -iTP -iSO -iTO)'#010+
@@ -194,7 +194,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'CPU_SOURCE:=$(word 1,$(COMPILERINFO))'#010+
   'endif'#010+
   'ifndef CPU_TARGET'#010+
-  'CPU_TARGET:=$(','word 2,$(COMPILERINFO))'#010+
+  'CPU_TARGET:=$(w','ord 2,$(COMPILERINFO))'#010+
   'endif'#010+
   'ifndef OS_SOURCE'#010+
   'OS_SOURCE:=$(word 3,$(COMPILERINFO))'#010+
@@ -207,7 +207,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '# Retrieve Target/Source CPU and Target/Source OS'#010+
   'ifndef CPU_SOURCE'#010+
-  'CPU_SOURCE:=$(s','hell $(FPC) -iSP)'#010+
+  'CPU_SOURCE:=$(sh','ell $(FPC) -iSP)'#010+
   'endif'#010+
   'ifndef CPU_TARGET'#010+
   'CPU_TARGET:=$(shell $(FPC) -iTP)'#010+
@@ -222,7 +222,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   #010+
-  '# Full name of the target, including CPU',' and OS'#010+
+  '# Full name of the target, including CPU ','and OS'#010+
   'FULL_TARGET=$(CPU_TARGET)-$(OS_TARGET)'#010+
   'FULL_SOURCE=$(CPU_SOURCE)-$(OS_SOURCE)'#010+
   #010+
@@ -232,7 +232,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# Check if the Makefile supports this target, but not'#010+
-  '# when the make ta','rget is to rebuild the makefile'#010+
+  '# when the make tar','get is to rebuild the makefile'#010+
   'ifeq ($(findstring makefile,$(MAKECMDGOALS)),)'#010+
   'ifeq ($(findstring $(OS_TARGET),$(MAKEFILETARGETS)),)'#010+
   '$(error The Makefile doesn'#039't support target $(OS_TARGET), please r'+
@@ -240,14 +240,14 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  'export OS_','TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SO'+
+  'export OS_T','ARGET OS_SOURCE CPU_TARGET CPU_SOURCE FULL_TARGET FULL_SO'+
   'URCE CROSSCOMPILE'#010+
   #010+
   #010+
   '[fpcdircheckenv]'#010+
   '#####################################################################'#010+
   '# FPCDIR Setting'#010+
-  '##########################################################','##########'+
+  '###########################################################','#########'+
   '#'#010+
   #010+
   '# Test FPCDIR to look if the RTL dir exists'#010+
@@ -260,7 +260,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'override FPCDIR=wrong'#010+
   'endif'#010+
   #010+
-  '# Default FPCD','IR from Makefile.fpc'#010+
+  '# Default FPCDI','R from Makefile.fpc'#010+
   'ifdef DEFAULT_FPCDIR'#010+
   'ifeq ($(FPCDIR),wrong)'#010+
   'override FPCDIR:=$(subst \,/,$(DEFAULT_FPCDIR))'#010+
@@ -272,14 +272,14 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '[fpcdirdetect]'#010+
   '# Detect FPCDIR'#010+
-  'i','feq ($(FPCDIR),wrong)'#010+
+  'if','eq ($(FPCDIR),wrong)'#010+
   'ifdef inUnix'#010+
   'override FPCDIR=/usr/local/lib/fpc/$(FPC_VERSION)'#010+
   'ifeq ($(wildcard $(FPCDIR)/units),)'#010+
   'override FPCDIR=/usr/lib/fpc/$(FPC_VERSION)'#010+
   'endif'#010+
   'else'#010+
-  'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard',' $(a'+
+  'override FPCDIR:=$(subst /$(FPC),,$(firstword $(strip $(wildcard ','$(a'+
   'ddsuffix /$(FPC),$(SEARCHPATH))))))'#010+
   'override FPCDIR:=$(FPCDIR)/..'#010+
   'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
@@ -287,7 +287,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)'#010+
   'override FPCDIR=c:/pp'#010+
   'endif'#010+
-  'endi','f'#010+
+  'endif',#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -302,7 +302,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# Units dir, when cross compiling try first the'#010+
-  'if','def CROSSCOMPILE'#010+
+  'ifd','ef CROSSCOMPILE'#010+
   'UNITSDIR:=$(wildcard $(CROSSTARGETDIR)/units)'#010+
   'ifeq ($(UNITSDIR),)'#010+
   'UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))'#010+
@@ -312,7 +312,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# Packages dir'#010+
-  'PACKAGESDIR:=$(wildcar','d $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/'+
+  'PACKAGESDIR:=$(wildcard',' $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/'+
   'packages/extra)'#010+
   #010+
   #010+
@@ -321,7 +321,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '# Shell tools'#010+
   '#####################################################################'#010+
   #010+
-  '# Echo t','hat can redir (must be able run in the default OS shell)'#010+
+  '# Echo th','at can redir (must be able run in the default OS shell)'#010+
   'ifndef ECHOREDIR'#010+
   'ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))'#010+
   'endif'#010+
@@ -333,8 +333,8 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '# Copy a whole tree'#010+
   'ifndef COPYTREE'#010+
-  'COPYTREE:=$(CPPROG) -rfp'#010,
-  'endif'#010+
+  'COPYTREE:=$(CPPROG) -rfp'#010+
+  'e','ndif'#010+
   #010+
   '# To move pograms'#010+
   'ifndef MOVE'#010+
@@ -354,7 +354,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '# To install files'#010+
   'ifndef INSTALL'#010+
   'ifdef inUnix'#010+
-  'IN','STALL:=$(GINSTALL) -c -m 644'#010+
+  'INS','TALL:=$(GINSTALL) -c -m 644'#010+
   'else'#010+
   'INSTALL:=$(COPY)'#010+
   'endif'#010+
@@ -371,7 +371,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '# To make a directory.'#010+
   'ifndef MKDIR'#010+
-  'MKDIR:=$(GINSTA','LL) -m 755 -d'#010+
+  'MKDIR:=$(GINSTAL','L) -m 755 -d'#010+
   'endif'#010+
   #010+
   'export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKD'+
@@ -381,7 +381,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '[defaultdirs]'#010+
   '#####################################################################'#010+
   '# Default Directories'#010+
-  '######################################','##############################'+
+  '#######################################','#############################'+
   '#'#010+
   #010+
   '# Units dir'#010+
@@ -395,7 +395,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   #010+
-  '# Linux, netbsd and freebsd use uni','x dirs with /usr/bin, /usr/lib'#010+
+  '# Linux, netbsd and freebsd use unix',' dirs with /usr/bin, /usr/lib'#010+
   '# When zipping use the target as default, when normal install then'#010+
   '# use the source os as default'#010+
   'ifdef ZIPINSTALL'#010+
@@ -404,7 +404,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'UNIXINSTALLDIR=1'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),freebsd)'#010+
-  'UNIX','INSTALLDIR=1'#010+
+  'UNIXI','NSTALLDIR=1'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),netbsd)'#010+
   'UNIXINSTALLDIR=1'#010+
@@ -419,8 +419,8 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'ifeq ($(OS_SOURCE),freebsd)'#010+
   'UNIXINSTALLDIR=1'#010+
-  'endif'#010,
-  'ifeq ($(OS_SOURCE),netbsd)'#010+
+  'endif'#010+
+  'i','feq ($(OS_SOURCE),netbsd)'#010+
   'UNIXINSTALLDIR=1'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),sunos)'#010+
@@ -435,7 +435,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# set the ','prefix directory where to install everything'#010+
+  '# set the p','refix directory where to install everything'#010+
   'ifndef INSTALL_PREFIX'#010+
   'ifdef UNIXINSTALLDIR'#010+
   'INSTALL_PREFIX=/usr/local'#010+
@@ -447,7 +447,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'endif'#010+
-  'export INSTALL_PRE','FIX'#010+
+  'export INSTALL_PREF','IX'#010+
   #010+
   '# Where to place the resulting zip files'#010+
   'ifndef DIST_DESTDIR'#010+
@@ -458,7 +458,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '#####################################################################'#010+
   '# Install Directories'#010+
-  '#############################','#######################################'+
+  '##############################','######################################'+
   '#'#010+
   #010+
   '# set the base directory where to install everything'#010+
@@ -467,7 +467,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifdef INSTALL_FPCPACKAGE'#010+
   'INSTALL_BASEDIR:=$(INSTALL_PREFIX)/lib/fpc/$(FPC_VERSION)'#010+
   'else'#010+
-  'INSTALL_BASED','IR:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+
+  'INSTALL_BASEDI','R:=$(INSTALL_PREFIX)/lib/$(PACKAGE_NAME)'#010+
   'endif'#010+
   'else'#010+
   'INSTALL_BASEDIR:=$(INSTALL_PREFIX)'#010+
@@ -479,7 +479,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifdef UNIXINSTALLDIR'#010+
   'INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin'#010+
   'else'#010+
-  'INS','TALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+
+  'INST','ALL_BINDIR:=$(INSTALL_BASEDIR)/bin'#010+
   '# for FPC packages install the binaries under their os target subdir'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
   'INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)'#010+
@@ -487,7 +487,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# set the directory where to install the uni','ts.'#010+
+  '# set the directory where to install the unit','s.'#010+
   'ifndef INSTALL_UNITDIR'#010+
   '# If cross compiling install in the cross compile directory'#010+
   'ifdef CROSSCOMPILE'#010+
@@ -495,7 +495,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'else'#010+
   'INSTALL_UNITDIR:=$(INSTALL_BASEDIR)/units/$(OS_TARGET)'#010+
   'endif'#010+
-  'ifdef',' INSTALL_FPCPACKAGE'#010+
+  'ifdef ','INSTALL_FPCPACKAGE'#010+
   'ifdef PACKAGE_NAME'#010+
   'INSTALL_UNITDIR:=$(INSTALL_UNITDIR)/$(PACKAGE_NAME)'#010+
   'endif'#010+
@@ -507,7 +507,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifdef UNIXINSTALLDIR'#010+
   'INSTALL_LIBDIR:=$(INSTALL_PREFIX)/lib'#010+
   'else'#010+
-  'INSTALL_','LIBDIR:=$(INSTALL_UNITDIR)'#010+
+  'INSTALL_L','IBDIR:=$(INSTALL_UNITDIR)'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -517,7 +517,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifdef INSTALL_FPCPACKAGE'#010+
   'ifdef BSDhier'#010+
   'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/share/src/fpc-$(FPC_VERSION)/$(PA'+
-  'CKAGE','_NAME)'#010+
+  'CKAGE_','NAME)'#010+
   'else'#010+
   'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/fpc-$(FPC_VERSION)/$(PACKAGE_'+
   'NAME)'#010+
@@ -527,7 +527,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/share/src/$(PACKAGE_NAME)-$(PACKA'+
   'GE_VERSION)'#010+
   'else'#010+
-  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src','/$(PACKAGE_NAME)-$(PACKAGE_V'+
+  'INSTALL_SOURCEDIR:=$(INSTALL_PREFIX)/src/','$(PACKAGE_NAME)-$(PACKAGE_V'+
   'ERSION)'#010+
   'endif'#010+
   'endif'#010+
@@ -540,7 +540,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'endif'#010+
   #010+
-  '# Where the doc files will be st','ored'#010+
+  '# Where the doc files will be sto','red'#010+
   'ifndef INSTALL_DOCDIR'#010+
   'ifdef UNIXINSTALLDIR'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
@@ -548,8 +548,8 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/share/doc/fpc-$(FPC_VERSION)/$(PACKA'+
   'GE_NAME)'#010+
   'else'#010+
-  'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NA',
-  'ME)'#010+
+  'INSTALL_DOCDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/$(PACKAGE_NAM',
+  'E)'#010+
   'endif'#010+
   'else'#010+
   'ifdef BSDhier'#010+
@@ -562,7 +562,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'else'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
-  'INSTALL_DOCD','IR:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+
+  'INSTALL_DOCDI','R:=$(INSTALL_BASEDIR)/doc/$(PACKAGE_NAME)'#010+
   'else'#010+
   'INSTALL_DOCDIR:=$(INSTALL_BASEDIR)/doc'#010+
   'endif'#010+
@@ -571,7 +571,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '# Where to install the examples, under linux we use the doc dir'#010+
   '# because the copytree command will create a subdir itself'#010+
-  'ifndef INST','ALL_EXAMPLEDIR'#010+
+  'ifndef INSTA','LL_EXAMPLEDIR'#010+
   'ifdef UNIXINSTALLDIR'#010+
   'ifdef INSTALL_FPCPACKAGE'#010+
   'ifdef BSDhier'#010+
@@ -579,7 +579,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   ')/$(PACKAGE_NAME)'#010+
   'else'#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_PREFIX)/doc/fpc-$(FPC_VERSION)/examples/'+
-  '$(','PACKAGE_NAME)'#010+
+  '$(P','ACKAGE_NAME)'#010+
   'endif'#010+
   'else'#010+
   'ifdef BSDhier'#010+
@@ -591,7 +591,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'else'#010+
-  'ifdef INSTALL_','FPCPACKAGE'#010+
+  'ifdef INSTALL_F','PCPACKAGE'#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples/$(PACKAGE_NAME)'#010+
   'else'#010+
   'INSTALL_EXAMPLEDIR:=$(INSTALL_BASEDIR)/examples'#010+
@@ -601,7 +601,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '# Where the some extra (data)files will be stored'#010+
   'ifndef INSTALL_DATADIR'#010+
-  'INSTALL_DATADIR=$(IN','STALL_BASEDIR)'#010+
+  'INSTALL_DATADIR=$(INS','TALL_BASEDIR)'#010+
   'endif'#010+
   #010+
   '#####################################################################'#010+
@@ -609,12 +609,12 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '#####################################################################'#010+
   #010+
   'ifdef CROSSCOMPILE'#010+
-  '# Directory where the cross compile t','ools are stored.'#010+
+  '# Directory where the cross compile to','ols are stored.'#010+
   '# First check if they are available in FPCDIR. If no targets/ subdir'#010+
   '# is found use the targets/ subdir in INSTALL_BASEDIR.'#010+
   'ifndef CROSSBINDIR'#010+
   'CROSSBINDIR:=$(wildcard $(CROSSTARGETDIR)/bin/$(FULL_SOURCE))'#010+
-  'ifeq ($(CROSSBINDI','R),)'#010+
+  'ifeq ($(CROSSBINDIR','),)'#010+
   'CROSSBINDIR:=$(wildcard $(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin/$('+
   'FULL_SOURCE))'#010+
   'endif'#010+
@@ -628,7 +628,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '# On linux, try to find where libgcc.a is.'#010+
   'ifdef inUnix'#010+
   'ifndef GCCLIBDIR'#010+
-  'GCCLIBDIR:=$(shell dirname `(g','cc -v 2>&1)| head -n 1| awk '#039'{ pri'+
+  'GCCLIBDIR:=$(shell dirname `(gc','c -v 2>&1)| head -n 1| awk '#039'{ pri'+
   'nt $$4 } '#039'`)'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),linux)'#010+
@@ -638,7 +638,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),netbsd)'#010+
-  'OTHERLIBDIR+=/usr/pkg','/lib'#010+
+  'OTHERLIBDIR+=/usr/pkg/','lib'#010+
   'endif'#010+
   'export GCCLIBDIR OTHERLIB'#010+
   'endif'#010+
@@ -649,7 +649,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '# Default extensions'#010+
   '#####################################################################'#010+
   #010+
-  '# Default needed ext','ensions (Go32v2,Linux)'#010+
+  '# Default needed exte','nsions (Go32v2,Linux)'#010+
   'LOADEREXT=.as'#010+
   'EXEEXT=.exe'#010+
   'PPLEXT=.ppl'#010+
@@ -667,7 +667,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '# Go32v1'#010+
   'ifeq ($(OS_TARGET),go32v1)'#010+
   'PPUEXT=.pp1'#010+
-  'OEXT','=.o1'#010+
+  'OEXT=','.o1'#010+
   'ASMEXT=.s1'#010+
   'SMARTEXT=.sl1'#010+
   'STATICLIBEXT=.a1'#010+
@@ -685,7 +685,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# Linux'#010+
-  'ifeq ($(OS_T','ARGET),linux)'#010+
+  'ifeq ($(OS_TA','RGET),linux)'#010+
   'EXEEXT='#010+
   'HASSHAREDLIB=1'#010+
   'FPCMADE=fpcmade.lnx'#010+
@@ -703,7 +703,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '# NetBSD'#010+
   'ifeq ($(OS_TARGET),netbsd)'#010+
   'EXEEXT='#010+
-  'HASSHA','REDLIB=1'#010+
+  'HASSHAR','EDLIB=1'#010+
   'FPCMADE=fpcmade.netbsd'#010+
   'ZIPSUFFIX=netbsd'#010+
   'endif'#010+
@@ -721,7 +721,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# OS/2'#010+
-  'ifeq ($(OS_TARGET),os','2)'#010+
+  'ifeq ($(OS_TARGET),os2',')'#010+
   'PPUEXT=.ppo'#010+
   'ASMEXT=.so2'#010+
   'OEXT=.oo2'#010+
@@ -740,7 +740,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'EXEEXT='#010+
   'PPUEXT=.ppa'#010+
   'ASMEXT=.asm'#010+
-  'OEXT=.','o'#010+
+  'OEXT=.o',#010+
   'SMARTEXT=.sl'#010+
   'STATICLIBEXT=.a'#010+
   'SHAREDLIBEXT=.library'#010+
@@ -759,7 +759,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# BeOS'#010+
-  'ifeq ($(OS_TARGET),be','os)'#010+
+  'ifeq ($(OS_TARGET),beo','s)'#010+
   'PPUEXT=.ppu'#010+
   'ASMEXT=.s'#010+
   'OEXT=.o'#010+
@@ -779,7 +779,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'STATICLIBEXT=.a'#010+
   'EXEEXT='#010+
   'FPCMADE=fpcmade.sun'#010+
-  'ZIPSUFF','IX=sun'#010+
+  'ZIPSUFFI','X=sun'#010+
   'endif'#010+
   #010+
   '# QNX'#010+
@@ -797,7 +797,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '[defaulttools]'#010+
   '#####################################################################'#010+
-  '# ','Default Tools'#010+
+  '# D','efault Tools'#010+
   '#####################################################################'#010+
   #010+
   '# Names of the binutils tools'#010+
@@ -811,7 +811,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ARNAME=arw'#010+
   'endif'#010+
   #010+
-  '# assembler, redefi','ne it if cross compiling'#010+
+  '# assembler, redefin','e it if cross compiling'#010+
   'ifndef ASPROG'#010+
   'ifdef CROSSBINDIR'#010+
   'ASPROG=$(CROSSBINDIR)/$(ASNAME)$(SRCEXEEXT)'#010+
@@ -823,7 +823,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '# linker, but probably not used'#010+
   'ifndef LDPROG'#010+
   'ifdef CROSSBINDIR'#010+
-  'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEE','XT)'#010+
+  'LDPROG=$(CROSSBINDIR)/$(LDNAME)$(SRCEXEEX','T)'#010+
   'else'#010+
   'LDPROG=$(LDNAME)'#010+
   'endif'#010+
@@ -841,7 +841,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '# Archiver'#010+
   'ifndef ARPROG'#010+
   'ifdef CROSSBINDIR'#010+
-  'ARPROG=$(CROSSBINDIR)/$(ARN','AME)$(SRCEXEEXT)'#010+
+  'ARPROG=$(CROSSBINDIR)/$(ARNA','ME)$(SRCEXEEXT)'#010+
   'else'#010+
   'ARPROG=$(ARNAME)'#010+
   'endif'#010+
@@ -860,7 +860,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifdef inUnix'#010+
   'LDCONFIG=ldconfig'#010+
   'else'#010+
-  'LDCO','NFIG='#010+
+  'LDCON','FIG='#010+
   'endif'#010+
   #010+
   'ifdef DATE'#010+
@@ -875,7 +875,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifndef UPXPROG'#010+
   'ifeq ($(OS_TARGET),go32v2)'#010+
   'UPXPROG:=1'#010+
-  'endi','f'#010+
+  'endif',#010+
   'ifeq ($(OS_TARGET),win32)'#010+
   'UPXPROG:=1'#010+
   'endif'#010+
@@ -891,7 +891,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'UPXPROG='#010+
   'endif'#010+
   'endif'#010+
-  'export UP','XPROG'#010+
+  'export UPX','PROG'#010+
   #010+
   '# Zip options'#010+
   'ZIPOPT=-9'#010+
@@ -909,14 +909,14 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '[command_begin]'#010+
   '#####################################################################'#010+
-  '# Compiler ','Command Line'#010+
+  '# Compiler C','ommand Line'#010+
   '#####################################################################'#010+
   #010+
   '# Load commandline OPTDEF and add FPC_CPU define, for compiling the'#010+
   '# compiler this needs to be turned off'#010+
   'ifndef NOCPUDEF'#010+
-  'override FPCOPTDEF=$(CPU_TARGET)'#010,
-  'endif'#010+
+  'override FPCOPTDEF=$(CPU_TARGET)'#010+
+  'e','ndif'#010+
   #010+
   '# Load commandline OPT and add target and unit dir to be sure'#010+
   'ifneq ($(OS_TARGET),$(OS_SOURCE))'#010+
@@ -925,7 +925,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '# User dirs should be first, so they are looked at first'#010+
   'ifdef UNITDIR'#010+
-  'override FPCOPT+=$(addprefi','x -Fu,$(UNITDIR))'#010+
+  'override FPCOPT+=$(addprefix',' -Fu,$(UNITDIR))'#010+
   'endif'#010+
   'ifdef LIBDIR'#010+
   'override FPCOPT+=$(addprefix -Fl,$(LIBDIR))'#010+
@@ -938,7 +938,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# Smartlinking'#010+
-  'ifdef LINKS','MART'#010+
+  'ifdef LINKSM','ART'#010+
   'override FPCOPT+=-XX'#010+
   'endif'#010+
   #010+
@@ -954,7 +954,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# Release mode (strip, optimize and don'#039't load fpc.cfg)'#010+
-  'ifdef R','ELEASE'#010+
+  'ifdef RE','LEASE'#010+
   'ifeq ($(CPU_TARGET),i386)'#010+
   'FPCCPUOPT:=-OG2p3'#010+
   'else'#010+
@@ -970,7 +970,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# Optimizer (i386 only for now)'#010+
-  'ifdef OPTIMIZE',#010+
+  'ifdef OPTIMIZE'#010,
   'ifeq ($(CPU_TARGET),i386)'#010+
   'override FPCOPT+=-OG2p3'#010+
   'endif'#010+
@@ -985,14 +985,14 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifdef COMPILER_OPTIONS'#010+
   'override FPCOPT+=$(COMPILER_OPTIONS)'#010+
   'endif'#010+
-  'i','fdef COMPILER_UNITDIR'#010+
+  'if','def COMPILER_UNITDIR'#010+
   'override FPCOPT+=$(addprefix -Fu,$(COMPILER_UNITDIR))'#010+
   'endif'#010+
   'ifdef COMPILER_LIBRARYDIR'#010+
   'override FPCOPT+=$(addprefix -Fl,$(COMPILER_LIBRARYDIR))'#010+
   'endif'#010+
   'ifdef COMPILER_OBJECTDIR'#010+
-  'override FPCOPT+=$(addprefix -Fo,$(COMPILER_','OBJECTDIR))'#010+
+  'override FPCOPT+=$(addprefix -Fo,$(COMPILER_O','BJECTDIR))'#010+
   'endif'#010+
   'ifdef COMPILER_INCLUDEDIR'#010+
   'override FPCOPT+=$(addprefix -Fi,$(COMPILER_INCLUDEDIR))'#010+
@@ -1003,7 +1003,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'override FPCOPT+=-FD$(CROSSBINDIR)'#010+
   'endif'#010+
   #010+
-  '# Target dirs and the prefix to use for clean/ins','tall'#010+
+  '# Target dirs and the prefix to use for clean/inst','all'#010+
   'ifdef COMPILER_TARGETDIR'#010+
   'override FPCOPT+=-FE$(COMPILER_TARGETDIR)'#010+
   'ifeq ($(COMPILER_TARGETDIR),.)'#010+
@@ -1014,7 +1014,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   '# Unit target dir'#010+
-  'ifdef COMPILER_UNITTARGETDI','R'#010+
+  'ifdef COMPILER_UNITTARGETDIR',#010+
   'override FPCOPT+=-FU$(COMPILER_UNITTARGETDIR)'#010+
   'ifeq ($(COMPILER_UNITTARGETDIR),.)'#010+
   'override UNITTARGETDIRPREFIX='#010+
@@ -1023,7 +1023,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'else'#010+
   'ifdef COMPILER_TARGETDIR'#010+
-  'override COMPILER_UNITTARGETDI','R=$(COMPILER_TARGETDIR)'#010+
+  'override COMPILER_UNITTARGETDIR','=$(COMPILER_TARGETDIR)'#010+
   'override UNITTARGETDIRPREFIX=$(TARGETDIRPREFIX)'#010+
   'endif'#010+
   'endif'#010+
@@ -1034,7 +1034,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
   'endif'#010+
   'ifdef OTHERLIBDIR'#010+
-  'override FPCOPT+=$(addprefix -Fl,$(OTHE','RLIBDIR))'#010+
+  'override FPCOPT+=$(addprefix -Fl,$(OTHER','LIBDIR))'#010+
   'endif'#010+
   #010+
   #010+
@@ -1049,7 +1049,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
   'endif'#010+
   #010+
-  '# Was a',' config file specified ?'#010+
+  '# Was a ','config file specified ?'#010+
   'ifdef CFGFILE'#010+
   'override FPCOPT+=@$(CFGFILE)'#010+
   'endif'#010+
@@ -1061,7 +1061,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'export FPCEXTCMD'#010+
   'endif'#010+
   #010+
-  '# Compiler commandl','ine'#010+
+  '# Compiler commandli','ne'#010+
   'override COMPILER:=$(FPC) $(FPCOPT)'#010+
   #010+
   '# also call ppas if with command option -s'#010+
@@ -1070,7 +1070,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'EXECPPAS='#010+
   'else'#010+
   'ifeq ($(OS_SOURCE),$(OS_TARGET))'#010+
-  'EXECPPAS:=@$(PPAS)',#010+
+  'EXECPPAS:=@$(PPAS)'#010,
   'endif'#010+
   'endif'#010+
   #010+
@@ -1083,7 +1083,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '.PHONY: fpc_loaders'#010+
   #010+
   'ifdef TARGET_LOADERS'#010+
-  'override ALLTARGET','+=fpc_loaders'#010+
+  'override ALLTARGET+','=fpc_loaders'#010+
   'override CLEANTARGET+=fpc_loaders_clean'#010+
   'override INSTALLTARGET+=fpc_loaders_install'#010+
   #010+
@@ -1093,7 +1093,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '%$(OEXT): %$(LOADEREXT)'#010+
   '        $(AS) -o $*$(OEXT) $<'#010+
   #010+
-  'fpc_loaders: $(LO','ADEROFILES)'#010+
+  'fpc_loaders: $(LOA','DEROFILES)'#010+
   #010+
   'fpc_loaders_clean:'#010+
   '        -$(DEL) $(LOADEROFILES)'#010+
@@ -1104,7 +1104,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   #010+
   '[unitrules]'#010+
-  '##################################################','##################'+
+  '###################################################','#################'+
   '#'#010+
   '# Units'#010+
   '#####################################################################'#010+
@@ -1115,7 +1115,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'override ALLTARGET+=fpc_units'#010+
   #010+
   'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
-  'override IM','PLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+
+  'override IMP','LICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICI'+
   'TUNITS))'#010+
   'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
@@ -1124,7 +1124,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'fpc_units: $(UNITPPUFILES)'#010+
   #010+
   #010+
-  '[exerule','s]'#010+
+  '[exerules',']'#010+
   '#####################################################################'#010+
   '# Exes'#010+
   '#####################################################################'#010+
@@ -1132,13 +1132,13 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '.PHONY: fpc_exes'#010+
   #010+
   'ifdef TARGET_PROGRAMS'#010+
-  'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_','PROGRAMS))'#010+
+  'override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_P','ROGRAMS))'#010+
   'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addprefi'+
   'x $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+
   #010+
   'override ALLTARGET+=fpc_exes'#010+
   'override INSTALLEXEFILES+=$(EXEFILES)'#010+
-  'override CLEANEXEFILE','S+=$(EXEFILES) $(EXEOFILES)'#010+
+  'override CLEANEXEFILES','+=$(EXEFILES) $(EXEOFILES)'#010+
   'ifeq ($(OS_TARGET),os2)'#010+
   'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
   'endif'#010+
@@ -1149,7 +1149,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   '[rstrules]'#010+
   '#####################################################################'#010+
-  '# R','esource strings'#010+
+  '# Re','source strings'#010+
   '#####################################################################'#010+
   #010+
   'ifdef TARGET_RSTS'#010+
@@ -1160,7 +1160,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   #010+
   '[examplerules]'#010+
-  '###################','#################################################'+
+  '####################','################################################'+
   '#'#010+
   '# Examples'#010+
   '#####################################################################'#010+
@@ -1169,11 +1169,11 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   'ifdef TARGET_EXAMPLES'#010+
   'HASEXAMPLES=1'#010+
-  'override EXAMPLESOURCEFILES:=$(wildcard $(addsuff','ix .pp,$(TARGET_EXA'+
+  'override EXAMPLESOURCEFILES:=$(wildcard $(addsuffi','x .pp,$(TARGET_EXA'+
   'MPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)))'#010+
   'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
   'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addp'+
-  'refix $(STATICLIBPREFIX),$(addsuffix $(S','TATICLIBEXT),$(TARGET_EXAMPL'+
+  'refix $(STATICLIBPREFIX),$(addsuffix $(ST','ATICLIBEXT),$(TARGET_EXAMPL'+
   'ES)))'#010+
   #010+
   'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
@@ -1183,8 +1183,8 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
   'HASEXAMPLES=1'#010+
-  'endif'#010,
-  #010+
+  'endif'#010+
+  #010,
   'fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIR'+
   'S))'#010+
   #010+
@@ -1192,12 +1192,12 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '[compilerules]'#010+
   '#####################################################################'#010+
   '# General compile rules'#010+
-  '######################################################','##############'+
+  '#######################################################','#############'+
   '#'#010+
   #010+
   '.PHONY: fpc_all fpc_smart fpc_debug fpc_release'#010+
   #010+
-  '$(FPCMADE): $(ALL_DEPENDENCIES) $(ALLTARGET)'#010+
+  '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
   '        @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
   #010+
   'fpc_all: $(FPCMADE)'#010+
@@ -1205,7 +1205,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'fpc_smart:'#010+
   '        $(MAKE) all LINKSMART=1 CREATESMART=1'#010+
   #010+
-  'fpc_d','ebug:'#010+
+  'fpc_deb','ug:'#010+
   '        $(MAKE) all DEBUG=1'#010+
   #010+
   'fpc_release:'#010+
@@ -1217,7 +1217,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res'#010+
   #010+
   '%$(PPUEXT): %.pp'#010+
-  '        ','$(COMPILER) $<'#010+
+  '        $(','COMPILER) $<'#010+
   '        $(EXECPPAS)'#010+
   #010+
   '%$(PPUEXT): %.pas'#010+
@@ -1233,7 +1233,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '        $(EXECPPAS)'#010+
   #010+
   '%.res: %.rc'#010+
-  '       ',' windres -i $< -o $@'#010+
+  '        w','indres -i $< -o $@'#010+
   #010+
   '# Search paths for .ppu and .pp and .pas'#010+
   'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
@@ -1242,7 +1242,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   #010+
   '[libraryrules]'#010+
-  '####','################################################################'+
+  '######','##############################################################'+
   '#'#010+
   '# Library'#010+
   '#####################################################################'#010+
@@ -1251,7 +1251,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   'ifndef LIB_FULLNAME'#010+
   'ifdef LIB_VERSION'#010+
-  'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERS','ION)'#010+
+  'LIB_FULLNAME=$(LIB_NAME).$(LIB_VERSIO','N)'#010+
   'else'#010+
   'LIB_FULLNAME=$(LIB_NAME)'#010+
   'endif'#010+
@@ -1264,7 +1264,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   #010+
   'fpc_shared: all'#010+
   'ifdef HASSHAREDLIB'#010+
-  '        $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_F','ULLNAME)'#010+
+  '        $(PPUMOVE) $(LIB_SHAREDUNITS) -o$(LIB_FUL','LNAME)'#010+
   'else'#010+
   '        @$(ECHO) Shared Libraries not supported'#010+
   'endif'#010+
@@ -1273,9 +1273,8 @@ const fpcmakeini : array[0..168,1..240] of char=(
   '[installrules]'#010+
   '#####################################################################'#010+
   '# Install rules'#010+
-  '#####################################################################',
-  #010+
-  #010+
+  '#####################################################################'#010+
+  #010,
   '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
   #010+
   'ifdef INSTALL_UNITS'#010+
@@ -1283,7 +1282,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   #010+
   'ifdef INSTALL_BUILDUNIT'#010+
-  'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PP','UEXT)'+
+  'override INSTALLPPUFILES:=$(filter-out $(INSTALL_BUILDUNIT)$(PPUE','XT)'+
   ',$(INSTALLPPUFILES))'#010+
   'endif'#010+
   #010+
@@ -1291,7 +1290,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
   'LES)) $(addprefix $(STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT)'+
   ',$(INSTALLPPUFILES)))'#010+
-  'override INSTALLPPUFILE','S:=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTA'+
+  'override INSTALLPPUFILES:','=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTA'+
   'LLPPUFILES))'#010+
   'override INSTALLPPULINKFILES:=$(wildcard $(addprefix $(UNITTARGETDIRPR'+
   'EFIX),$(INSTALLPPULINKFILES)))'#010+
@@ -1299,7 +1298,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'override INSTALL_CREATEPACKAGEFPC=1'#010+
   'endif'#010+
   #010+
-  'ifdef',' INSTALLEXEFILES'#010+
+  'ifdef I','NSTALLEXEFILES'#010+
   'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(INSTALLEXEF'+
   'ILES))'#010+
   'endif'#010+
@@ -1308,7 +1307,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifdef INSTALLEXEFILES'#010+
   '        $(MKDIR) $(INSTALL_BINDIR)'#010+
   '# Compress the exes if upx is defined'#010+
-  'ifdef UPXP','ROG'#010+
+  'ifdef UPXPRO','G'#010+
   '        -$(UPXPROG) $(INSTALLEXEFILES)'#010+
   'endif'#010+
   '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
@@ -1317,13 +1316,13 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifdef FPCMAKE'#010+
   '# If the fpcpackage variable is set then create and install Package.fp'+
   'c,'#010+
-  '# a safe','ty check is done if Makefile.fpc is available'#010+
+  '# a safety',' check is done if Makefile.fpc is available'#010+
   'ifdef PACKAGE_VERSION'#010+
   'ifneq ($(wildcard Makefile.fpc),)'#010+
   '        $(FPCMAKE) -p -T$(OS_TARGET) Makefile.fpc'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
   '        $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
-  'en','dif'#010+
+  'endi','f'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
@@ -1333,7 +1332,7 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'ifneq ($(INSTALLPPULINKFILES),)'#010+
   '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
   'endif'#010+
-  'ifne','q ($(wildcard $(LIB_FULLNAME)),)'#010+
+  'ifneq ','($(wildcard $(LIB_FULLNAME)),)'#010+
   '        $(MKDIR) $(INSTALL_LIBDIR)'#010+
   '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
   'ifdef inUnix'#010+
@@ -1342,13 +1341,13 @@ const fpcmakeini : array[0..168,1..240] of char=(
   'endif'#010+
   'endif'#010+
   'ifdef INSTALL_FILES'#010+
-  '       ',' $(MKDIR) $(INSTALL_DATADIR)'#010+
+  '        $','(MKDIR) $(INSTALL_DATADIR)'#010+
   '        $(INSTALL) $(INSTALL_FILES) $(INSTALL_DATADIR)'#010+
   'endif'#010+
   #010+
   'fpc_sourceinstall: distclean'#010+
   '        $(MKDIR) $(INSTALL_SOURCEDIR)'#010+
-  '        $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)'#010+
+  '        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
   #010+
   'fpc_exampleinstall: $(addsuff','ix _distclean,$(TARGET_EXAMPLEDIRS))'#010+
   'ifdef HASEXAMPLES'#010+

utils/fpcm/fpcmake.ini

@@ -164,7 +164,7 @@ endif
 export FPC FPC_VERSION
 # CHECKDEPEND should not be exported
 # This should limit multiple checks
-unexport CHECKDEPEND ALL_DEPENDENCIES
+unexport CHECKDEPEND ALLDEPENDENCIES
 
 #####################################################################
 # FPC Target Detection
@@ -1150,7 +1150,7 @@ fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
 
 .PHONY: fpc_all fpc_smart fpc_debug fpc_release
 
-$(FPCMADE): $(ALL_DEPENDENCIES) $(ALLTARGET)
+$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
         @$(ECHOREDIR) Compiled > $(FPCMADE)
 
 fpc_all: $(FPCMADE)
@@ -1291,7 +1291,7 @@ endif
 
 fpc_sourceinstall: distclean
         $(MKDIR) $(INSTALL_SOURCEDIR)
-        $(COPYTREE) $(BASEDIR) $(INSTALL_SOURCEDIR)
+        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)
 
 fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS))
 ifdef HASEXAMPLES

utils/fpcm/fpcmwr.pp

@@ -567,7 +567,7 @@ implementation
           FOutput.Add('ifdef CHECKDEPEND');
           FOutput.Add('$('+packdirvar+')/$(FPCMADE):');
           FOutput.Add(#9'$(MAKE) -C $('+packdirvar+') $(FPCMADE)');
-          FOutput.Add('override ALL_DEPENDENCIES+=$('+packdirvar+')/$(FPCMADE)');
+          FOutput.Add('override ALLDEPENDENCIES+=$('+packdirvar+')/$(FPCMADE)');
           FOutput.Add('endif');
           { Package dir doesn't exists, check unit dir }
           FOutput.Add('else');
@@ -697,7 +697,8 @@ implementation
         if SkippedSecs=4 then
          begin
            FHasSection[sec_compile]:=false;
-           if (not CheckTargetVariable('install_units')) and
+           if (not CheckTargetVariable('package_name')) and
+              (not CheckTargetVariable('install_units')) and
               (not CheckTargetVariable('install_files')) and
               (not CheckTargetVariable('install_createpackagefpc')) then
             FHasSection[sec_install]:=false;
@@ -865,7 +866,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.21  2002-02-28 17:03:47  pierre
+  Revision 1.22  2002-03-11 19:10:36  peter
+    * Regenerated with updated fpcmake
+
+  Revision 1.21  2002/02/28 17:03:47  pierre
    + CHECKDEPEND var to check if packages are up to date
 
   Revision 1.20  2002/01/27 21:42:35  peter

utils/fprcp/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -249,7 +249,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,7 +310,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -760,7 +759,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

utils/h2pas/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -250,7 +250,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -312,7 +311,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -761,7 +760,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

utils/simulator/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -249,7 +249,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -311,7 +310,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -760,7 +759,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=

utils/tply/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2002/02/28]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2002/03/11]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx
@@ -251,7 +251,6 @@ endif
 endif
 endif
 export INSTALL_PREFIX
-export INSTALL_SOURCESUBDIR
 ifndef DIST_DESTDIR
 DIST_DESTDIR:=$(BASEDIR)
 endif
@@ -313,7 +312,7 @@ endif
 endif
 else
 ifdef INSTALL_FPCPACKAGE
-INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(INSTALL_SOURCESUBDIR)/$(PACKAGE_NAME)
+INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source/$(PACKAGE_NAME)
 else
 INSTALL_SOURCEDIR:=$(INSTALL_BASEDIR)/source
 endif
@@ -762,7 +761,7 @@ endif
 ifdef CHECKDEPEND
 $(PACKAGEDIR_RTL)/$(FPCMADE):
 	$(MAKE) -C $(PACKAGEDIR_RTL) $(FPCMADE)
-override ALL_DEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
+override ALLDEPENDENCIES+=$(PACKAGEDIR_RTL)/$(FPCMADE)
 endif
 else
 PACKAGEDIR_RTL=