* regenerated

Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/06]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: help
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -280,11 +280,10 @@ ALLTARGET=all
 endif
 endif
 endif
-PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
-ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
-PKGUNITSPRE=units
-else
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 PKGUNITSPRE=u
+else
+PKGUNITSPRE=units-
 endif
 ifdef CROSSINSTALL
 PKGPRE=$(FULL_TARGET)-
@@ -525,62 +524,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -588,72 +578,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1468,8 +1463,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1495,10 +1493,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1526,10 +1524,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1669,8 +1667,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
@@ -2196,15 +2197,15 @@ ifdef IDE
 	$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
 endif
 zipinstall: $(BUILDSTAMP)
-	$(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=$(PKGPRE)base$(ZIPSUFFIX) $(INSTALLOPTS)
-	$(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
-	$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
-	$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
+	$(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=base $(INSTALLOPTS)
+	$(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+	$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+	$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
-	$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
+	$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS)
 endif
 singlezipinstall: $(BUILDSTAMP)
-	$(MAKE) fpc_zipinstall ZIPTARGET=install ZIPNAME=fpc-$(FULL_TARGET) $(INSTALLOPTS)
+	$(MAKE) fpc_zipinstall ZIPTARGET=install ZIPNAME=fpc $(INSTALLOPTS)
 .PHONY: crossall crossinstall crosszipinstall crosssinglezipinstall
 crossall:
 	$(MAKE) all CROSSINSTALL=1
@@ -2213,19 +2214,19 @@ crossinstall:
 crosszipinstall:
 	$(MAKE) zipinstall CROSSINSTALL=1
 crosssinglezipinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=crossinstall ZIPNAME=fpc-cross-$(FULL_TARGET) $(INSTALLOPTS)
-.PHONY: docspdf docs docsrcinstall docsrc
+	$(MAKE) fpc_zipinstall ZIPTARGET=crossinstall ZIPNAME=fpc $(INSTALLOPTS)
+.PHONY: docspdf makepackdocs docsrcinstall docsrc
 DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs
 docspdf:
 	$(MAKE) -C docs pdfinstall DOCINSTALLDIR=$(PACKDIR)
-docs:
-	$(MAKE) fpc_zipinstall ZIPTARGET=docspdf ZIPNAME=docs
+makepackdocs:
+	$(MAKE) fpc_zipinstall ZIPTARGET=docspdf FULLZIPNAME=docs
 docsrcinstall:
 	$(MAKE) -C docs clean
 	$(MKDIR) $(DOCSOURCEDIR)
 	$(COPYTREE) docs/* $(DOCSOURCEDIR)
 docsrc:
-	$(MAKE) fpc_zipinstall ZIPTARGET=docsrcinstall ZIPNAME=docsrc
+	$(MAKE) fpc_zipinstall ZIPTARGET=docsrcinstall FULLZIPNAME=docsrc
 .PHONY: demozip
 ifdef UNIXHier
 DEMOSOURCEDIR=$(INSTALL_DOCDIR)/../demo
@@ -2237,7 +2238,7 @@ demosrcinstall:
 	$(MKDIR) $(DEMOSOURCEDIR)
 	$(COPYTREE) demo/* $(DEMOSOURCEDIR)
 demozip:
-	$(MAKE) fpc_zipinstall ZIPTARGET=demosrcinstall ZIPNAME=demo
+	$(MAKE) fpc_zipinstall ZIPTARGET=demosrcinstall FULLZIPNAME=demo
 .PHONY: sourcebase sourcezip
 INSTALL_BASESOURCEDIR=$(INSTALL_SOURCEDIR)/..
 sourcebase:
@@ -2252,7 +2253,7 @@ sourcebase:
 	$(COPY) packages/base/Makefile* $(INSTALL_BASESOURCEDIR)/packages/base
 	$(COPY) packages/extra/Makefile* $(INSTALL_BASESOURCEDIR)/packages/extra
 sourcezip:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=base ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 	$(MAKE) compiler_zipsourceinstall
 	$(MAKE) rtl_zipsourceinstall
 	$(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGUNITSPRE)

Makefile.fpc

@@ -91,11 +91,10 @@ endif
 endif
 
 # Prefix for units
-PKGUNITSPRELONGTARGETS=linux freebsd netbsd openbsd
-ifneq ($(findstring $(OS_TARGET),$(PKGUNITSPRELONGTARGETS)),)
-PKGUNITSPRE=units
-else
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 PKGUNITSPRE=u
+else
+PKGUNITSPRE=units-
 endif
 
 # Cross compile needs a prefix to not conflict with original packages
@@ -321,16 +320,16 @@ ifdef IDE
 endif
 
 zipinstall: $(BUILDSTAMP)
-        $(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=$(PKGPRE)base$(ZIPSUFFIX) $(INSTALLOPTS)
-        $(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
-        $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGPRE)$(PKGUNITSPRE)
-        $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)util$(ZIPSUFFIX)
+        $(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=base $(INSTALLOPTS)
+        $(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+        $(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+        $(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
-        $(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPNAME=$(PKGPRE)ide$(ZIPSUFFIX)
+        $(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS)
 endif
 
 singlezipinstall: $(BUILDSTAMP)
-        $(MAKE) fpc_zipinstall ZIPTARGET=install ZIPNAME=fpc-$(FULL_TARGET) $(INSTALLOPTS)
+        $(MAKE) fpc_zipinstall ZIPTARGET=install ZIPNAME=fpc $(INSTALLOPTS)
 
 
 ##########################################################################
@@ -349,14 +348,14 @@ crosszipinstall:
         $(MAKE) zipinstall CROSSINSTALL=1
 
 crosssinglezipinstall:
-        $(MAKE) fpc_zipinstall ZIPTARGET=crossinstall ZIPNAME=fpc-cross-$(FULL_TARGET) $(INSTALLOPTS)
+        $(MAKE) fpc_zipinstall ZIPTARGET=crossinstall ZIPNAME=fpc $(INSTALLOPTS)
 
 
 ##########################################################################
 # Docs
 ##########################################################################
 
-.PHONY: docspdf docs docsrcinstall docsrc
+.PHONY: docspdf makepackdocs docsrcinstall docsrc
 
 # We don't want the package name fpc in the path
 DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs
@@ -364,8 +363,9 @@ DOCSOURCEDIR=$(INSTALL_SOURCEDIR)/../docs
 docspdf:
         $(MAKE) -C docs pdfinstall DOCINSTALLDIR=$(PACKDIR)
 
-docs:
-        $(MAKE) fpc_zipinstall ZIPTARGET=docspdf ZIPNAME=docs
+# Used by makepack to generate unix installation .tar
+makepackdocs:
+        $(MAKE) fpc_zipinstall ZIPTARGET=docspdf FULLZIPNAME=docs
 
 docsrcinstall:
         $(MAKE) -C docs clean
@@ -373,7 +373,7 @@ docsrcinstall:
         $(COPYTREE) docs/* $(DOCSOURCEDIR)
 
 docsrc:
-        $(MAKE) fpc_zipinstall ZIPTARGET=docsrcinstall ZIPNAME=docsrc
+        $(MAKE) fpc_zipinstall ZIPTARGET=docsrcinstall FULLZIPNAME=docsrc
 
 
 ##########################################################################
@@ -395,7 +395,7 @@ demosrcinstall:
         $(COPYTREE) demo/* $(DEMOSOURCEDIR)
 
 demozip:
-        $(MAKE) fpc_zipinstall ZIPTARGET=demosrcinstall ZIPNAME=demo
+        $(MAKE) fpc_zipinstall ZIPTARGET=demosrcinstall FULLZIPNAME=demo
 
 
 ##########################################################################
@@ -421,7 +421,7 @@ sourcebase:
         $(COPY) packages/extra/Makefile* $(INSTALL_BASESOURCEDIR)/packages/extra
 
 sourcezip:
-        $(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=basesrc
+        $(MAKE) fpc_zipinstall ZIPTARGET=sourcebase ZIPNAME=base ZIPSUFFIX=$(ZIPSOURCESUFFIX)
         $(MAKE) compiler_zipsourceinstall
         $(MAKE) rtl_zipsourceinstall
         $(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGUNITSPRE)

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/11]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -220,7 +220,7 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
 override PACKAGE_NAME=compiler
-override PACKAGE_VERSION=1.9.4
+override PACKAGE_VERSION=1.9.5
 unexport FPC_VERSION FPC_COMPILERINFO
 CYCLETARGETS=i386 powerpc sparc arm x86_64
 ifdef ALPHA
@@ -537,62 +537,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -600,72 +591,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1538,8 +1534,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1565,10 +1564,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1596,10 +1595,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1739,8 +1738,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)
@@ -1884,6 +1886,11 @@ TEMPNAME2=ppc2$(EXEEXT)
 TEMPNAME3=ppc3$(EXEEXT)
 MAKEDEP=ppdep$(EXEEXT)
 MSG2INC=./msg2inc$(EXEEXT)
+ifdef CROSSINSTALL
+INSTALLEXEFILE=$(PPCROSSNAME)
+else
+INSTALLEXEFILE=$(EXENAME)
+endif
 PPC_TARGETS=alpha i386 m68k powerpc sparc arm x86_64
 .PHONY: $(PPC_TARGETS)
 $(PPC_TARGETS):
@@ -2018,16 +2025,12 @@ else
 PPCCPULOCATION=$(INSTALL_BINDIR)
 endif
 quickinstall: $(addsuffix _install,$(TARGET_DIRS))
-ifneq ($(PPEXEFILE),)
+ifneq ($(INSTALLEXEFILE),)
 ifdef UPXPROG
-	-$(UPXPROG) $(EXENAME)
+	-$(UPXPROG) $(INSTALLEXEFILE)
 endif
 	$(MKDIR) $(PPCCPULOCATION)
-ifdef CROSSINSTALL
-	$(INSTALLEXE) $(PPCROSSNAME) $(PPCCPULOCATION)/$(EXENAME)
-else
-	$(INSTALLEXE) $(EXENAME) $(PPCCPULOCATION)
-endif
+	$(INSTALLEXE) $(INSTALLEXEFILE) $(PPCCPULOCATION)/$(EXENAME)
 endif
 install: quickinstall
 ifndef CROSSINSTALL

compiler/Makefile.fpc

@@ -4,7 +4,7 @@
 
 [package]
 name=compiler
-version=1.9.4
+version=1.9.5
 
 [target]
 programs=pp
@@ -235,7 +235,11 @@ TEMPNAME2=ppc2$(EXEEXT)
 TEMPNAME3=ppc3$(EXEEXT)
 MAKEDEP=ppdep$(EXEEXT)
 MSG2INC=./msg2inc$(EXEEXT)
-
+ifdef CROSSINSTALL
+INSTALLEXEFILE=$(PPCROSSNAME)
+else
+INSTALLEXEFILE=$(EXENAME)
+endif
 
 #####################################################################
 # CPU targets
@@ -495,16 +499,12 @@ quickinstall: $(addsuffix _install,$(TARGET_DIRS))
 # Install ppcXXX executable, for a cross installation we install
 # the ppcrossXXX as ppcXXX. The target native build ppcXXX is not used
 # for this installation type
-ifneq ($(PPEXEFILE),)
+ifneq ($(INSTALLEXEFILE),)
 ifdef UPXPROG
-        -$(UPXPROG) $(EXENAME)
+        -$(UPXPROG) $(INSTALLEXEFILE)
 endif
         $(MKDIR) $(PPCCPULOCATION)
-ifdef CROSSINSTALL
-        $(INSTALLEXE) $(PPCROSSNAME) $(PPCCPULOCATION)/$(EXENAME)
-else
-        $(INSTALLEXE) $(EXENAME) $(PPCCPULOCATION)
-endif
+        $(INSTALLEXE) $(INSTALLEXEFILE) $(PPCCPULOCATION)/$(EXENAME)
 endif
 
 install: quickinstall

compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1555,8 +1551,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -443,62 +443,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -506,72 +497,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1386,8 +1382,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1413,10 +1412,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1444,10 +1443,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1587,8 +1586,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1564,8 +1560,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -436,62 +436,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -499,72 +490,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1559,8 +1555,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -430,62 +430,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -493,72 +484,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1553,8 +1549,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -430,62 +430,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -493,72 +484,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1553,8 +1549,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -428,62 +428,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -491,72 +482,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1551,8 +1547,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -430,62 +430,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -493,72 +484,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1553,8 +1549,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/Makefile

@@ -1,11 +1,11 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/11/26]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
 BSDs = freebsd netbsd openbsd darwin
 UNIXs = linux $(BSDs) sunos qnx
-LIMIT83fs = go32v2 os2
+LIMIT83fs = go32v2 os2 emx watcom
 FORCE:
 .PHONY: FORCE
 override PATH:=$(patsubst %/,%,$(subst \,/,$(PATH)))
@@ -518,62 +518,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -581,72 +572,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1979,8 +1975,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -2006,10 +2005,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -2037,10 +2036,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -2180,8 +2179,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -479,62 +479,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -542,72 +533,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1790,8 +1786,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -447,62 +447,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -510,72 +501,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1580,8 +1576,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -460,62 +460,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -523,72 +514,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1658,8 +1654,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/memds/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -433,62 +433,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -496,72 +487,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1566,8 +1562,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -461,62 +461,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -524,72 +515,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1659,8 +1655,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/odbc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -459,62 +459,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -522,72 +513,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1657,8 +1653,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/sdf/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1565,8 +1561,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/sqldb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -477,62 +477,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -540,72 +531,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1727,8 +1723,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/sqldb/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1638,8 +1634,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/sqldb/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1638,8 +1634,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/sqldb/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -459,62 +459,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -522,72 +513,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1639,8 +1635,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/sqlite/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -431,62 +431,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -494,72 +485,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1605,8 +1601,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -456,62 +456,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -519,72 +510,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -2088,8 +2084,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/fpcunit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -434,62 +434,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -497,72 +488,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1567,8 +1563,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/fpcunit/exampletests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -433,62 +433,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -496,72 +487,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1548,8 +1544,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/fpcunit/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -433,62 +433,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -496,72 +487,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1548,8 +1544,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/image/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -442,62 +442,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -505,72 +496,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1693,8 +1689,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/net/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -489,62 +489,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -552,72 +543,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1757,8 +1753,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/net/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -457,62 +457,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -520,72 +511,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -2098,8 +2094,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/passrc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -433,62 +433,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -496,72 +487,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1548,8 +1544,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -433,62 +433,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -496,72 +487,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1566,8 +1562,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -456,62 +456,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -519,72 +510,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -2256,8 +2252,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -462,62 +462,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -525,72 +516,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -2094,8 +2090,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -433,62 +433,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -496,72 +487,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1548,8 +1544,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fv/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -435,62 +435,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -498,72 +489,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1446,8 +1442,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1473,10 +1472,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1504,10 +1503,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1647,8 +1646,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

fv/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -428,62 +428,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -491,72 +482,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1610,8 +1606,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -482,62 +482,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -545,72 +536,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1666,8 +1662,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1693,10 +1692,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1724,10 +1723,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1867,8 +1866,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

ide/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -448,62 +448,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -511,72 +502,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1563,8 +1559,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

ide/fakegdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -431,62 +431,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -494,72 +485,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1546,8 +1542,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

installer/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -447,62 +447,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -510,72 +501,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1566,8 +1562,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1593,10 +1592,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1624,10 +1623,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1767,8 +1766,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -430,62 +430,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -493,72 +484,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1429,8 +1425,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -451,62 +451,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -514,72 +505,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1450,8 +1446,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -480,62 +480,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -543,72 +534,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1497,8 +1493,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1524,10 +1523,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1555,10 +1554,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1698,8 +1697,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1475,8 +1471,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1502,10 +1501,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1533,10 +1532,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1676,8 +1675,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/libasync/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -446,62 +446,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -509,72 +500,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1439,8 +1435,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1466,10 +1465,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1497,10 +1496,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1640,8 +1639,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/libc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -457,62 +457,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -520,72 +511,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1456,8 +1452,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1483,10 +1482,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1514,10 +1513,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1657,8 +1656,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/md5/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1475,8 +1471,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1502,10 +1501,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1533,10 +1532,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1676,8 +1675,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/netdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -462,62 +462,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -525,72 +516,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1473,8 +1469,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1500,10 +1499,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1531,10 +1530,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1674,8 +1673,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/odbc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1475,8 +1471,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1502,10 +1501,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1533,10 +1532,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1676,8 +1675,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1475,8 +1471,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1502,10 +1501,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1533,10 +1532,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1676,8 +1675,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -456,62 +456,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -519,72 +510,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -2157,8 +2153,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/pasjpeg/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1475,8 +1471,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1502,10 +1501,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1533,10 +1532,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1676,8 +1675,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/pthreads/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -431,62 +431,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -494,72 +485,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1424,8 +1420,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1451,10 +1450,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1482,10 +1481,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1625,8 +1624,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -433,62 +433,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -496,72 +487,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1444,8 +1440,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1471,10 +1470,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1502,10 +1501,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1645,8 +1644,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/base/sqlite/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -431,62 +431,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -494,72 +485,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1424,8 +1420,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1451,10 +1450,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1482,10 +1481,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1625,8 +1624,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -465,62 +465,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -528,72 +519,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1464,8 +1460,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/amunits/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -433,62 +433,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -496,72 +487,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1376,8 +1372,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1403,10 +1402,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1434,10 +1433,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1577,8 +1576,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/amunits/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -434,62 +434,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -497,72 +488,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1427,8 +1423,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1454,10 +1453,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1485,10 +1484,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1628,8 +1627,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/amunits/utilunits/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -434,62 +434,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -497,72 +488,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1427,8 +1423,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1454,10 +1453,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1485,10 +1484,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1628,8 +1627,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/bfd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -431,62 +431,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -494,72 +485,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1424,8 +1420,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1451,10 +1450,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1482,10 +1481,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1625,8 +1624,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/cdrom/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -438,62 +438,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -501,72 +492,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1449,8 +1445,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1476,10 +1475,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1507,10 +1506,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1650,8 +1649,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -459,62 +459,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -522,72 +513,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1552,8 +1548,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1579,10 +1578,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1610,10 +1609,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1753,8 +1752,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -455,62 +455,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -518,72 +509,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1702,8 +1698,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/fpgtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -2119,8 +2115,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -2146,10 +2145,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -2177,10 +2176,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -2320,8 +2319,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/fpgtk/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -456,62 +456,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -519,72 +510,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -2306,8 +2302,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1475,8 +1471,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1502,10 +1501,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1533,10 +1532,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1676,8 +1675,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gnome1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -430,62 +430,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -493,72 +484,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1429,8 +1425,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gnome1/gconf/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -459,62 +459,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -522,72 +513,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1635,8 +1631,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1662,10 +1661,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1693,10 +1692,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1836,8 +1835,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gnome1/gconf/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -456,62 +456,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -519,72 +510,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1803,8 +1799,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gnome1/gnome/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1693,8 +1689,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1720,10 +1719,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1751,10 +1750,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1894,8 +1893,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gnome1/zvt/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -459,62 +459,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -522,72 +513,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1712,8 +1708,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1739,10 +1738,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1770,10 +1769,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1913,8 +1912,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gnome1/zvt/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -456,62 +456,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -519,72 +510,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1939,8 +1935,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -460,62 +460,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -523,72 +514,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1577,8 +1573,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1604,10 +1603,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1635,10 +1634,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1778,8 +1777,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -457,62 +457,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -520,72 +511,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1745,8 +1741,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -454,62 +454,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -517,72 +508,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1618,8 +1614,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1697,8 +1693,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/imlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -459,62 +459,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -522,72 +513,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1635,8 +1631,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1662,10 +1661,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1693,10 +1692,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1836,8 +1835,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1475,8 +1471,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1502,10 +1501,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1533,10 +1532,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1676,8 +1675,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -457,62 +457,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -520,72 +511,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1515,8 +1511,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1542,10 +1541,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1573,10 +1572,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1716,8 +1715,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/mmsystem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -431,62 +431,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -494,72 +485,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1424,8 +1420,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1451,10 +1450,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1482,10 +1481,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1625,8 +1624,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -458,62 +458,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -521,72 +512,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1475,8 +1471,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1502,10 +1501,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1533,10 +1532,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1676,8 +1675,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/numlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -431,62 +431,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -494,72 +485,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1424,8 +1420,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1451,10 +1450,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1482,10 +1481,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1625,8 +1624,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -470,62 +470,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -533,72 +524,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1528,8 +1524,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1555,10 +1554,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1586,10 +1585,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1729,8 +1728,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -219,8 +219,9 @@ ifeq ($(UNITSDIR),)
 UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 endif
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
-override TARGET_PROGRAMS+=glutdemo morph3d bounce
+override TARGET_PROGRAMS+=glutdemo morph3d bounce radblur
 override INSTALL_FPCPACKAGE=y
+override COMPILER_OPTIONS+=-S2h
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 endif
@@ -455,62 +456,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -518,72 +510,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1684,8 +1681,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/os2units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -430,62 +430,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -493,72 +484,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1429,8 +1425,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/os2units/clkdll/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/os2units/ftpapi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/os2units/hwvideo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -431,62 +431,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -494,72 +485,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1424,8 +1420,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1451,10 +1450,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1482,10 +1481,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1625,8 +1624,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/os2units/lvm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/os2units/lvm/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -429,62 +429,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -492,72 +483,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1552,8 +1548,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/os2units/mmtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -432,62 +432,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -495,72 +486,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1443,8 +1439,11 @@ ifndef ZIPNAME
 ifdef DIST_ZIPNAME
 ZIPNAME=$(DIST_ZIPNAME)
 else
-ZIPNAME=$(ZIPPREFIX)$(PACKAGE_NAME)$(ZIPSUFFIX)
+ZIPNAME=$(PACKAGE_NAME)
+endif
 endif
+ifndef FULLZIPNAME
+FULLZIPNAME=$(ZIPCROSSPREFIX)$(ZIPPREFIX)$(ZIPNAME)$(ZIPSUFFIX)
 endif
 ifndef ZIPTARGET
 ifdef DIST_ZIPTARGET
@@ -1470,10 +1469,10 @@ endif
 ZIPCMD_CDPACK:=cd $(subst /,$(ZIPPATHSEP),$(PACKDIR))
 ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))
 ifdef USETAR
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(TAREXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)
 ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
 else
-ZIPDESTFILE:=$(DIST_DESTDIR)/$(ZIPNAME)$(ZIPEXT)
+ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(ZIPEXT)
 ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
 endif
 fpc_zipinstall:
@@ -1501,10 +1500,10 @@ else
 endif
 	$(DELTREE) $(PACKDIR)
 fpc_zipsourceinstall:
-	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=src
+	$(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIPSOURCESUFFIX)
 fpc_zipexampleinstall:
 ifdef HASEXAMPLES
-	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=exm
+	$(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZIPEXAMPLESUFFIX)
 endif
 fpc_zipdistinstall:
 	$(MAKE) fpc_zipinstall ZIPTARGET=distinstall
@@ -1644,8 +1643,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)

packages/extra/os2units/mmtk/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -429,62 +429,53 @@ RSTEXT=.rst
 ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 ifeq ($(OS_TARGET),go32v1)
 STATICLIBPREFIX=
-FPCMADEEXT=v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADEEXT=dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADEEXT=wat
-ZIPSUFFIX=watc
 OEXT=.obj
 ASMEXT=.asm
 SHAREDLIBEXT=.dll
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=fbs
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=nbs
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADEEXT=obs
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 SHAREDLIBEXT=.dll
-FPCMADEEXT=w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=os2
-ZIPSUFFIX=os2
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),emx)
@@ -492,72 +483,77 @@ BATCHEXT=.cmd
 AOUTEXT=.out
 STATICLIBPREFIX=
 SHAREDLIBEXT=.dll
-FPCMADEEXT=emx
-ZIPSUFFIX=emx
+SHORTSUFFIX=emx
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),morphos)
 EXEEXT=
 SHAREDLIBEXT=.library
-FPCMADEEXT=mos
+SHORTSUFFIX=mos
 endif
 ifeq ($(OS_TARGET),atari)
 EXEEXT=.ttp
-FPCMADEEXT=ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nw
-ZIPSUFFIX=nw
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 EXEEXT=.nlm
 STATICLIBPREFIX=
-FPCMADEEXT=nwl
-ZIPSUFFIX=nwl
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
 EXEEXT=
-FPCMADEEXT=mac
-ZIPSUFFIX=macos
 DEBUGSYMEXT=.xcoff
+SHORTSUFFIX=mac
 endif
 ifeq ($(OS_TARGET),darwin)
 BATCHEXT=.sh
 EXEEXT=
-FPCMADEEXT=dwn
 HASSHAREDLIB=1
-ZIPSUFFIX=darwin
+SHORTSUFFIX=dwn
 endif
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-FPCMADE=fpcmade.$(FPCMADEEXT)
+FPCMADE=fpcmade.$(SHORTSUFFIX)
+ZIPSUFFIX=$(SHORTSUFFIX)
+ZIPCROSSPREFIX=
+ZIPSOURCESUFFIX=src
+ZIPEXAMPLESUFFIX=exm
 else
 FPCMADE=fpcmade.$(FULL_TARGET)
+ZIPSOURCESUFFIX=.source
+ZIPEXAMPLESUFFIX=.examples
+ifdef CROSSCOMPILE
+ZIPSUFFIX=.$(FULL_SOURCE)
+ZIPCROSSPREFIX=$(FULL_TARGET)-
+else
+ZIPSUFFIX=.$(FULL_TARGET)
+ZIPCROSSPREFIX=
+endif
 endif
 else
 ifeq ($(OS_TARGET),go32v1)
@@ -1552,8 +1548,11 @@ fpc_baseinfo:
 	@$(ECHO)  == Install info ==
 	@$(ECHO)
 	@$(ECHO)  DateStr.............. $(DATESTR)
+	@$(ECHO)  ZipName.............. $(ZIPNAME)
 	@$(ECHO)  ZipPrefix............ $(ZIPPREFIX)
+	@$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)
 	@$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)
+	@$(ECHO)  FullZipName.......... $(FULLZIPNAME)
 	@$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)
 	@$(ECHO)
 	@$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)