* regenerated

Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: help
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -632,24 +632,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -659,46 +641,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -707,8 +682,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -720,8 +694,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -732,7 +705,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -741,7 +714,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -751,8 +724,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -762,8 +734,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -773,8 +744,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -784,9 +754,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -796,9 +765,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -809,7 +777,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -2141,18 +2127,18 @@ $(BUILDSTAMP):
 	$(MAKE) rtl_clean $(CLEANOPTS)
 	$(MAKE) packages_clean $(CLEANOPTS)
 	$(MAKE) fcl_clean $(CLEANOPTS)
+	$(MAKE) fv_clean $(CLEANOPTS)
 	$(MAKE) utils_clean $(CLEANOPTS)
 ifdef IDE
-	$(MAKE) fv_clean $(CLEANOPTS)
 	$(MAKE) ide_clean $(CLEANOPTS)
 endif
 	$(MAKE) rtl_$(ALLTARGET) $(BUILDOPTS)
 	$(MAKE) packages_base_$(ALLTARGET) $(BUILDOPTS)
 	$(MAKE) fcl_$(ALLTARGET) $(BUILDOPTS)
+	$(MAKE) fv_$(ALLTARGET) $(BUILDOPTS)
 	$(MAKE) packages_extra_$(ALLTARGET) $(BUILDOPTS)
 	$(MAKE) utils_all $(BUILDOPTS)
 ifdef IDE
-	$(MAKE) fv_all $(BUILDOPTS)
 	$(MAKE) ide_all $(BUILDOPTS)
 	$(MAKE) installer_all $(BUILDOPTS)
 endif
@@ -2192,6 +2178,7 @@ install: $(BUILDSTAMP)
 	$(MAKE) installbase $(INSTALLOPTS)
 	$(MAKE) packages_$(INSTALLTARGET) $(INSTALLOPTS)
 	$(MAKE) fcl_$(INSTALLTARGET) $(INSTALLOPTS)
+	$(MAKE) fv_$(INSTALLTARGET) $(INSTALLOPTS)
 	$(MAKE) utils_$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
 	$(MAKE) ide_$(INSTALLTARGET) $(BUILDOPTS)
@@ -2200,6 +2187,7 @@ zipinstall: $(BUILDSTAMP)
 	$(MAKE) fpc_zipinstall ZIPTARGET=installbase ZIPNAME=base $(INSTALLOPTS)
 	$(MAKE) packages_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
 	$(MAKE) fcl_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
+	$(MAKE) fv_zip$(INSTALLTARGET) $(INSTALLOPTS) ZIPPREFIX=$(PKGUNITSPRE)
 	$(MAKE) utils_zip$(INSTALLTARGET) $(INSTALLOPTS)
 ifdef IDE
 	$(MAKE) ide_zip$(INSTALLTARGET) $(INSTALLOPTS)
@@ -2258,6 +2246,7 @@ sourcezip:
 	$(MAKE) rtl_zipsourceinstall
 	$(MAKE) packages_zipsourceinstall ZIPPREFIX=$(PKGUNITSPRE)
 	$(MAKE) fcl_zipsourceinstall
+	$(MAKE) fv_zipsourceinstall
 	$(MAKE) utils_zipsourceinstall
 	$(MAKE) ide_zipsourceinstall
 	$(MAKE) installer_zipsourceinstall
@@ -2273,24 +2262,34 @@ sunoszip: checkfpcdir
 	$(MAKE) zipinstall OS_TARGET=sunos TARPROG=gtar
 .PHONY: renametoshort shortsrc shortbin shortnames
 renametoshort:
-	-mv compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIX).zip
-	-mv utils$(ZIPSUFFIX).zip util$(ZIPSUFFIX).zip
-	-mv installer$(ZIPSUFFIX).zip inst$(ZIPSUFFIX).zip
-	-mv ugdbint$(ZIPSUFFIX).zip ugdb$(ZIPSUFFIX).zip
-	-mv uregexpr$(ZIPSUFFIX).zip ureg$(ZIPSUFFIX).zip
-	-mv upaszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIX).zip
-	-mv uuncgi$(ZIPSUFFIX).zip ucgi$(ZIPSUFFIX).zip
-	-mv uunzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIX).zip
-	-mv unetdb$(ZIPSUFFIX).zip undb$(ZIPSUFFIX).zip
-	-mv uftpapi$(ZIPSUFFIX).zip uftp$(ZIPSUFFIX).zip
-	-mv uhwvideo$(ZIPSUFFIX).zip uhwv$(ZIPSUFFIX).zip
-	-mv uclkdll$(ZIPSUFFIX).zip uclk$(ZIPSUFFIX).zip
-	-mv upasjpeg$(ZIPSUFFIX).zip upjp$(ZIPSUFFIX).zip
+	-mv base$(ZIPSUFFIX).zip base$(ZIPSUFFIXSHORT).zip
+	-mv compiler$(ZIPSUFFIX).zip comp$(ZIPSUFFIXSHORT).zip
+	-mv utils$(ZIPSUFFIX).zip util$(ZIPSUFFIXSHORT).zip
+	-mv installer$(ZIPSUFFIX).zip inst$(ZIPSUFFIXSHORT).zip
+	-mv units-fcl$(ZIPSUFFIX).zip ufcl$(ZIPSUFFIXSHORT).zip
+	-mv units-gdbint$(ZIPSUFFIX).zip ugdb$(ZIPSUFFIXSHORT).zip
+	-mv units-regexpr$(ZIPSUFFIX).zip ureg$(ZIPSUFFIXSHORT).zip
+	-mv units-paszlib$(ZIPSUFFIX).zip upzl$(ZIPSUFFIXSHORT).zip
+	-mv units-unzip$(ZIPSUFFIX).zip uzip$(ZIPSUFFIXSHORT).zip
+	-mv units-netdb$(ZIPSUFFIX).zip undb$(ZIPSUFFIXSHORT).zip
+	-mv units-ftpapi$(ZIPSUFFIX).zip uftp$(ZIPSUFFIXSHORT).zip
+	-mv units-hwvideo$(ZIPSUFFIX).zip uhwv$(ZIPSUFFIXSHORT).zip
+	-mv units-clkdll$(ZIPSUFFIX).zip uclk$(ZIPSUFFIXSHORT).zip
+	-mv units-pasjpeg$(ZIPSUFFIX).zip upjp$(ZIPSUFFIXSHORT).zip
+	-mv units-fv$(ZIPSUFFIX).zip ufv$(ZIPSUFFIXSHORT).zip
 shortsrc:
-	$(MAKE) renametoshort ZIPSUFFIX=src
+	$(MAKE) renametoshort ZIPSUFFIX=$(ZIPSOURCESUFFIX) ZIPSUFFIXSHORT=src
 shortbin:
-	$(MAKE) renametoshort
+	$(MAKE) renametoshort ZIPSUFFIXSHORT=$(SHORTSUFFIX)
 shortnames: shortsrc shortbin
+.PHONY: dist
+dist:
+	$(MAKE) sourcezip
+	$(MAKE) demozip
+	$(MAKE) zipinstall
+ifneq ($(findstring $(OS_TARGET),$(LIMIT83fs)),)
+	$(MAKE) shortnames
+endif
 ifdef inUnix
 ifneq ($(wildcard $(CVSINSTALL)/debian/changelog),)
 .PHONY: debcopy deb

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -645,24 +645,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -672,46 +654,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -720,8 +695,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -733,8 +707,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -745,7 +718,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -754,7 +727,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -764,8 +737,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -775,8 +747,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -786,8 +757,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -797,9 +767,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -809,9 +778,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -822,7 +790,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1434,7 +1420,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

compiler/utils/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1329,7 +1315,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -551,24 +551,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -578,46 +560,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -626,8 +601,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -639,8 +613,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -651,7 +624,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -660,7 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -670,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -681,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -692,8 +663,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -703,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -715,9 +684,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -728,7 +696,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO

demo/graph/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1338,7 +1324,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

demo/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -544,24 +544,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -571,46 +553,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -619,8 +594,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -632,8 +606,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -644,7 +617,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -653,7 +626,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -663,8 +636,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -674,8 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -685,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -696,9 +666,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -708,9 +677,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -721,7 +689,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1333,7 +1319,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

demo/modex/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -538,24 +538,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -565,46 +547,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -613,8 +588,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -626,8 +600,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -638,7 +611,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -647,7 +620,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -657,8 +630,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -668,8 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -679,8 +650,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -690,9 +660,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -702,9 +671,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -715,7 +683,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1327,7 +1313,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

demo/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -538,24 +538,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -565,46 +547,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -613,8 +588,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -626,8 +600,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -638,7 +611,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -647,7 +620,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -657,8 +630,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -668,8 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -679,8 +650,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -690,9 +660,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -702,9 +671,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -715,7 +683,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1327,7 +1313,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

demo/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -536,24 +536,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -563,46 +545,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -611,8 +586,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -624,8 +598,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -636,7 +609,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -645,7 +618,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -655,8 +628,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -666,8 +638,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -677,8 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -688,9 +658,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -700,9 +669,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -713,7 +681,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1325,7 +1311,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

demo/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -538,24 +538,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -565,46 +547,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -613,8 +588,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -626,8 +600,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -638,7 +611,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -647,7 +620,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -657,8 +630,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -668,8 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -679,8 +650,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -690,9 +660,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -702,9 +671,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -715,7 +683,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1327,7 +1313,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -626,24 +626,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -653,46 +635,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -701,8 +676,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -714,8 +688,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -726,7 +699,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -735,7 +708,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -745,8 +718,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -756,8 +728,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -767,8 +738,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -778,9 +748,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -790,9 +759,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -803,7 +771,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1875,7 +1861,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -587,24 +587,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -614,46 +596,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -662,8 +637,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -675,8 +649,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -687,7 +660,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -696,7 +669,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -706,8 +679,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -717,8 +689,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -728,8 +699,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -739,9 +709,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -751,9 +720,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -764,7 +732,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1564,7 +1550,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/dbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -555,24 +555,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -582,46 +564,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -630,8 +605,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -643,8 +617,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -655,7 +628,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -674,8 +647,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -685,8 +657,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -696,8 +667,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -707,9 +677,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -719,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -732,7 +700,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1354,7 +1340,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -568,24 +568,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -595,46 +577,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -643,8 +618,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -656,8 +630,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -668,7 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -677,7 +650,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -687,8 +660,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -698,8 +670,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -709,8 +680,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -720,9 +690,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -732,9 +701,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -745,7 +713,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1432,7 +1418,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/memds/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -541,24 +541,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -568,46 +550,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -616,8 +591,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -629,8 +603,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -641,7 +614,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -660,8 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -671,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -682,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -693,9 +663,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -705,9 +674,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -718,7 +686,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1340,7 +1326,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -569,24 +569,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -596,46 +578,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -644,8 +619,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -657,8 +631,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -669,7 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -678,7 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -688,8 +661,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -699,8 +671,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -710,8 +681,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -721,9 +691,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -733,9 +702,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -746,7 +714,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1433,7 +1419,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/odbc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -567,24 +567,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -594,46 +576,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -642,8 +617,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -655,8 +629,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -667,7 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -676,7 +649,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -686,8 +659,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -697,8 +669,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -708,8 +679,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -719,9 +689,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -731,9 +700,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -744,7 +712,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1431,7 +1417,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/sdf/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/sqldb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -585,24 +585,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -612,46 +594,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -660,8 +635,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -673,8 +647,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -685,7 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -694,7 +667,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -704,8 +677,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -715,8 +687,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -726,8 +697,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -737,9 +707,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -749,9 +718,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -762,7 +730,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1501,7 +1487,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/sqldb/interbase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1412,7 +1398,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/sqldb/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1412,7 +1398,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/sqldb/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -567,24 +567,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -594,46 +576,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -642,8 +617,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -655,8 +629,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -667,7 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -676,7 +649,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -686,8 +659,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -697,8 +669,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -708,8 +679,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -719,9 +689,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -731,9 +700,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -744,7 +712,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1413,7 +1399,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/sqlite/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1379,7 +1365,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/db/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -564,24 +564,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -591,46 +573,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -639,8 +614,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -652,8 +626,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -673,7 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -683,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -694,8 +666,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -705,8 +676,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -716,9 +686,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -728,9 +697,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -741,7 +709,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1862,7 +1848,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/fpcunit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -542,24 +542,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -569,46 +551,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -617,8 +592,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -630,8 +604,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -642,7 +615,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -651,7 +624,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -661,8 +634,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -672,8 +644,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -683,8 +654,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -694,9 +664,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -706,9 +675,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -719,7 +687,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1341,7 +1327,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/fpcunit/exampletests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -541,24 +541,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -568,46 +550,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -616,8 +591,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -629,8 +603,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -641,7 +614,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -660,8 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -671,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -682,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -693,9 +663,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -705,9 +674,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -718,7 +686,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1322,7 +1308,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/fpcunit/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -541,24 +541,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -568,46 +550,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -616,8 +591,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -629,8 +603,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -641,7 +614,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -660,8 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -671,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -682,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -693,9 +663,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -705,9 +674,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -718,7 +686,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1322,7 +1308,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/image/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -550,24 +550,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -577,46 +559,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -625,8 +600,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -638,8 +612,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -659,7 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -669,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -680,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -691,8 +662,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -702,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -714,9 +683,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -727,7 +695,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1467,7 +1453,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/net/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -597,24 +597,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -624,46 +606,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -672,8 +647,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -685,8 +659,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -697,7 +670,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -706,7 +679,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -716,8 +689,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -727,8 +699,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -738,8 +709,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -749,9 +719,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -761,9 +730,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -774,7 +742,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1531,7 +1517,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/net/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -565,24 +565,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -592,46 +574,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -640,8 +615,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -653,8 +627,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -665,7 +638,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -674,7 +647,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -684,8 +657,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -695,8 +667,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -706,8 +677,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -717,9 +687,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -729,9 +698,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -742,7 +710,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1872,7 +1858,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/passrc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -541,24 +541,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -568,46 +550,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -616,8 +591,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -629,8 +603,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -641,7 +614,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -660,8 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -671,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -682,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -693,9 +663,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -705,9 +674,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -718,7 +686,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1322,7 +1308,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -541,24 +541,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -568,46 +550,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -616,8 +591,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -629,8 +603,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -641,7 +614,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -660,8 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -671,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -682,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -693,9 +663,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -705,9 +674,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -718,7 +686,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1340,7 +1326,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/shedit/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -564,24 +564,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -591,46 +573,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -639,8 +614,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -652,8 +626,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -673,7 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -683,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -694,8 +666,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -705,8 +676,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -716,9 +686,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -728,9 +697,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -741,7 +709,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -2030,7 +2016,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -570,24 +570,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -597,46 +579,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -645,8 +620,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -658,8 +632,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -670,7 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -679,7 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -689,8 +662,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -700,8 +672,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -711,8 +682,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -722,9 +692,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -734,9 +703,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -747,7 +715,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1868,7 +1854,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fcl/xml/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -541,24 +541,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -568,46 +550,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -616,8 +591,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -629,8 +603,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -641,7 +614,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -660,8 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -671,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -682,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -693,9 +663,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -705,9 +674,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -718,7 +686,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1322,7 +1308,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fv/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -543,24 +543,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -570,46 +552,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -618,8 +593,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -631,8 +605,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -643,7 +616,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -652,7 +625,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -662,8 +635,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -673,8 +645,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -684,8 +655,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -695,9 +665,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -707,9 +676,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -720,7 +688,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1342,7 +1328,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

fv/test/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -536,24 +536,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -563,46 +545,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -611,8 +586,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -624,8 +598,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -636,7 +609,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -645,7 +618,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -655,8 +628,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -666,8 +638,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -677,8 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -688,9 +658,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -700,9 +669,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -713,7 +681,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1384,7 +1370,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -590,24 +590,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -617,46 +599,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -665,8 +640,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -678,8 +652,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -690,7 +663,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -699,7 +672,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -709,8 +682,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -720,8 +692,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -731,8 +702,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -742,9 +712,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -754,9 +723,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -767,7 +735,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1562,7 +1548,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

ide/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -556,24 +556,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -583,46 +565,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -631,8 +606,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -644,8 +618,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -656,7 +629,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -665,7 +638,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -675,8 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -686,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -697,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -708,9 +678,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -720,9 +689,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -733,7 +701,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1337,7 +1323,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

ide/fakegdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1320,7 +1306,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

installer/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -555,24 +555,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -582,46 +564,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -630,8 +605,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -643,8 +617,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -655,7 +628,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -674,8 +647,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -685,8 +657,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -696,8 +667,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -707,9 +677,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -719,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -732,7 +700,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1462,7 +1448,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -538,24 +538,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -565,46 +547,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -613,8 +588,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -626,8 +600,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -638,7 +611,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -647,7 +620,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -657,8 +630,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -668,8 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -679,8 +650,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -690,9 +660,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -702,9 +671,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -715,7 +683,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO

packages/base/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -559,24 +559,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -586,46 +568,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -634,8 +609,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -647,8 +621,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -659,7 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -668,7 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -678,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -689,8 +661,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -700,8 +671,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -711,9 +681,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -723,9 +692,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -736,7 +704,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO

packages/base/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -588,24 +588,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -615,46 +597,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -663,8 +638,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -676,8 +650,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -688,7 +661,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -697,7 +670,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -707,8 +680,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -718,8 +690,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -729,8 +700,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -740,9 +710,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -752,9 +721,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -765,7 +733,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1393,7 +1379,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1371,7 +1357,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/libasync/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -554,24 +554,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -581,46 +563,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -629,8 +604,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -642,8 +616,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -654,7 +627,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -663,7 +636,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -673,8 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -684,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -695,8 +666,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -706,9 +676,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -718,9 +687,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -731,7 +699,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1335,7 +1321,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/libc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -565,24 +565,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -592,46 +574,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -640,8 +615,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -653,8 +627,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -665,7 +638,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -674,7 +647,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -684,8 +657,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -695,8 +667,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -706,8 +677,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -717,9 +687,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -729,9 +698,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -742,7 +710,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1352,7 +1338,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/md5/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1371,7 +1357,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/netdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -570,24 +570,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -597,46 +579,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -645,8 +620,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -658,8 +632,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -670,7 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -679,7 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -689,8 +662,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -700,8 +672,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -711,8 +682,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -722,9 +692,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -734,9 +703,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -747,7 +715,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1369,7 +1355,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/odbc/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1371,7 +1357,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/oracle/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1371,7 +1357,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/oracle/example/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -564,24 +564,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -591,46 +573,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -639,8 +614,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -652,8 +626,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -673,7 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -683,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -694,8 +666,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -705,8 +676,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -716,9 +686,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -728,9 +697,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -741,7 +709,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1931,7 +1917,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/pasjpeg/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1371,7 +1357,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/pthreads/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1320,7 +1306,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/regexpr/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -541,24 +541,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -568,46 +550,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -616,8 +591,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -629,8 +603,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -641,7 +614,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -660,8 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -671,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -682,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -693,9 +663,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -705,9 +674,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -718,7 +686,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1340,7 +1326,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/base/sqlite/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1320,7 +1306,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -573,24 +573,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -600,46 +582,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -648,8 +623,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -661,8 +635,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -673,7 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -682,7 +655,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -692,8 +665,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -703,8 +675,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -714,8 +685,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -725,9 +695,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -737,9 +706,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -750,7 +718,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO

packages/extra/amunits/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -541,24 +541,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -568,46 +550,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -616,8 +591,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -629,8 +603,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -641,7 +614,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -650,7 +623,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -660,8 +633,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -671,8 +643,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -682,8 +653,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -693,9 +663,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -705,9 +674,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -718,7 +686,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO

packages/extra/amunits/units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -542,24 +542,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -569,46 +551,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -617,8 +592,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -630,8 +604,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -642,7 +615,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -651,7 +624,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -661,8 +634,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -672,8 +644,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -683,8 +654,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -694,9 +664,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -706,9 +675,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -719,7 +687,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1323,7 +1309,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/amunits/utilunits/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -542,24 +542,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -569,46 +551,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -617,8 +592,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -630,8 +604,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -642,7 +615,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -651,7 +624,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -661,8 +634,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -672,8 +644,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -683,8 +654,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -694,9 +664,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -706,9 +675,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -719,7 +687,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1323,7 +1309,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/bfd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1320,7 +1306,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/cdrom/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -546,24 +546,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -573,46 +555,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -621,8 +596,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -634,8 +608,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -646,7 +619,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -655,7 +628,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -665,8 +638,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -676,8 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -687,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -698,9 +668,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -710,9 +679,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -723,7 +691,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1345,7 +1331,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -567,24 +567,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -594,46 +576,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -642,8 +617,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -655,8 +629,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -667,7 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -676,7 +649,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -686,8 +659,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -697,8 +669,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -708,8 +679,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -719,9 +689,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -731,9 +700,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -744,7 +712,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1448,7 +1434,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/forms/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -563,24 +563,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -590,46 +572,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -638,8 +613,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -651,8 +625,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -663,7 +636,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -672,7 +645,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -682,8 +655,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -693,8 +665,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -704,8 +675,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -715,9 +685,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -727,9 +696,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -740,7 +708,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1476,7 +1462,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/fpgtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -2015,7 +2001,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/fpgtk/demo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -564,24 +564,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -591,46 +573,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -639,8 +614,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -652,8 +626,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -673,7 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -683,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -694,8 +666,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -705,8 +676,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -716,9 +686,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -728,9 +697,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -741,7 +709,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -2080,7 +2066,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gdbm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1371,7 +1357,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gnome1/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -538,24 +538,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -565,46 +547,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -613,8 +588,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -626,8 +600,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -638,7 +611,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -647,7 +620,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -657,8 +630,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -668,8 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -679,8 +650,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -690,9 +660,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -702,9 +671,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -715,7 +683,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO

packages/extra/gnome1/gconf/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -567,24 +567,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -594,46 +576,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -642,8 +617,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -655,8 +629,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -667,7 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -676,7 +649,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -686,8 +659,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -697,8 +669,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -708,8 +679,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -719,9 +689,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -731,9 +700,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -744,7 +712,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1531,7 +1517,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gnome1/gconf/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -564,24 +564,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -591,46 +573,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -639,8 +614,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -652,8 +626,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -673,7 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -683,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -694,8 +666,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -705,8 +676,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -716,9 +686,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -728,9 +697,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -741,7 +709,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1577,7 +1563,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gnome1/gnome/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1589,7 +1575,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gnome1/zvt/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -567,24 +567,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -594,46 +576,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -642,8 +617,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -655,8 +629,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -667,7 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -676,7 +649,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -686,8 +659,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -697,8 +669,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -708,8 +679,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -719,9 +689,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -731,9 +700,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -744,7 +712,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1608,7 +1594,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gnome1/zvt/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -564,24 +564,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -591,46 +573,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -639,8 +614,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -652,8 +626,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -673,7 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -683,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -694,8 +666,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -705,8 +676,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -716,9 +686,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -728,9 +697,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -741,7 +709,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1713,7 +1699,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -568,24 +568,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -595,46 +577,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -643,8 +618,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -656,8 +630,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -668,7 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -677,7 +650,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -687,8 +660,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -698,8 +670,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -709,8 +680,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -720,9 +690,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -732,9 +701,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -745,7 +713,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1473,7 +1459,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -565,24 +565,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -592,46 +574,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -640,8 +615,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -653,8 +627,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -665,7 +638,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -674,7 +647,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -684,8 +657,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -695,8 +667,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -706,8 +677,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -717,9 +687,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -729,9 +698,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -742,7 +710,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1519,7 +1505,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/gtk/examples/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -562,24 +562,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -589,46 +571,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -637,8 +612,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -650,8 +624,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -662,7 +635,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -671,7 +644,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -681,8 +654,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -692,8 +664,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -703,8 +674,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -714,9 +684,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -726,9 +695,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -739,7 +707,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO

packages/extra/gtk/gtkgl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1471,7 +1457,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/imlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -567,24 +567,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -594,46 +576,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -642,8 +617,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -655,8 +629,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -667,7 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -676,7 +649,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -686,8 +659,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -697,8 +669,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -708,8 +679,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -719,9 +689,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -731,9 +700,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -744,7 +712,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1531,7 +1517,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/libgd/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1371,7 +1357,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/libpng/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -565,24 +565,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -592,46 +574,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -640,8 +615,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -653,8 +627,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -665,7 +638,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -674,7 +647,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -684,8 +657,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -695,8 +667,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -706,8 +677,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -717,9 +687,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -729,9 +698,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -742,7 +710,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1411,7 +1397,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/mmsystem/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1320,7 +1306,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -566,24 +566,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -593,46 +575,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -641,8 +616,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -654,8 +628,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -666,7 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -675,7 +648,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -685,8 +658,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -696,8 +668,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -707,8 +678,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -718,9 +688,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -730,9 +699,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -743,7 +711,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1371,7 +1357,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/numlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1320,7 +1306,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -578,24 +578,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -605,46 +587,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -653,8 +628,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -666,8 +640,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -678,7 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -687,7 +660,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -697,8 +670,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -708,8 +680,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -719,8 +690,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -730,9 +700,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -742,9 +711,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -755,7 +723,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1424,7 +1410,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/opengl/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -564,24 +564,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -591,46 +573,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -639,8 +614,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -652,8 +626,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -664,7 +637,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -673,7 +646,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -683,8 +656,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -694,8 +666,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -705,8 +676,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -716,9 +686,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -728,9 +697,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -741,7 +709,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1459,7 +1445,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/os2units/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -538,24 +538,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -565,46 +547,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -613,8 +588,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -626,8 +600,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -638,7 +611,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -647,7 +620,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -657,8 +630,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -668,8 +640,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -679,8 +650,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -690,9 +660,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -702,9 +671,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -715,7 +683,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO

packages/extra/os2units/clkdll/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/os2units/ftpapi/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/os2units/hwvideo/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1320,7 +1306,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/os2units/lvm/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/os2units/lvm/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -537,24 +537,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -564,46 +546,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -612,8 +587,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -625,8 +599,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -637,7 +610,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -646,7 +619,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -656,8 +629,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -667,8 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -678,8 +649,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -689,9 +659,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -701,9 +670,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -714,7 +682,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1326,7 +1312,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/os2units/mmtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/os2units/mmtk/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -537,24 +537,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -564,46 +546,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -612,8 +587,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -625,8 +599,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -637,7 +610,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -646,7 +619,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -656,8 +629,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -667,8 +639,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -678,8 +649,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -689,9 +659,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -701,9 +670,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -714,7 +682,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1326,7 +1312,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/palmunits/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -539,24 +539,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -566,46 +548,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -614,8 +589,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -627,8 +601,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -639,7 +612,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -648,7 +621,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -658,8 +631,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -669,8 +641,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -680,8 +651,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -691,9 +661,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -703,9 +672,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -716,7 +684,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1320,7 +1306,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas

packages/extra/rexx/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/19]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/12/20]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -540,24 +540,6 @@ EXEEXT=
 HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
-ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
-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)
 PPUEXT=.pp1
@@ -567,46 +549,39 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 ifeq ($(OS_TARGET),win32)
 PPUEXT=.ppw
@@ -615,8 +590,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 ifeq ($(OS_TARGET),os2)
 BATCHEXT=.cmd
@@ -628,8 +602,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 ifeq ($(OS_TARGET),amiga)
@@ -640,7 +613,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 ifeq ($(OS_TARGET),atari)
 PPUEXT=.ppu
@@ -649,7 +622,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 ifeq ($(OS_TARGET),beos)
 BATCHEXT=.sh
@@ -659,8 +632,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 ifeq ($(OS_TARGET),sunos)
 BATCHEXT=.sh
@@ -670,8 +642,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 ifeq ($(OS_TARGET),qnx)
 BATCHEXT=.sh
@@ -681,8 +652,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 ifeq ($(OS_TARGET),netware)
 STATICLIBPREFIX=
@@ -692,9 +662,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 ifeq ($(OS_TARGET),netwlibc)
 STATICLIBPREFIX=
@@ -704,9 +673,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 ifeq ($(OS_TARGET),macos)
 BATCHEXT=
@@ -717,7 +685,25 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
+endif
+endif
+ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
+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
 ifndef ECHO
@@ -1339,7 +1325,7 @@ $(COMPILER_TARGETDIR):
 %$(PPUEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
 %$(EXEEXT): %.pas