* zipsuffix support for 1.0.x

utils/fpcm/fpcmake.ini

@@ -875,27 +875,6 @@ HASSHAREDLIB=1
 SHORTSUFFIX=dwn
 endif
 
-# For 8.3 limited OS's the short suffixes
-# Otherwise use the full source/target names
-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
 # long version for 1.0.x - target specific extensions
 
@@ -908,22 +887,19 @@ SMARTEXT=.sl1
 STATICLIBEXT=.a1
 SHAREDLIBEXT=.so1
 STATICLIBPREFIX=
-FPCMADE=fpcmade.v1
-PACKAGESUFFIX=v1
+SHORTSUFFIX=v1
 endif
 
 # Go32v2
 ifeq ($(OS_TARGET),go32v2)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=go32
+SHORTSUFFIX=dos
 endif
 
 # watcom
 ifeq ($(OS_TARGET),watcom)
 STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
+SHORTSUFFIX=wat
 endif
 
 # Linux
@@ -931,8 +907,7 @@ ifeq ($(OS_TARGET),linux)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.lnx
-ZIPSUFFIX=linux
+SHORTSUFFIX=lnx
 endif
 
 # FreeBSD
@@ -940,8 +915,7 @@ ifeq ($(OS_TARGET),freebsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.freebsd
-ZIPSUFFIX=freebsd
+SHORTSUFFIX=fbs
 endif
 
 # NetBSD
@@ -949,8 +923,7 @@ ifeq ($(OS_TARGET),netbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.netbsd
-ZIPSUFFIX=netbsd
+SHORTSUFFIX=nbs
 endif
 
 # OpenBSD
@@ -958,8 +931,7 @@ ifeq ($(OS_TARGET),openbsd)
 BATCHEXT=.sh
 EXEEXT=
 HASSHAREDLIB=1
-FPCMADE=fpcmade.openbsd
-ZIPSUFFIX=openbsd
+SHORTSUFFIX=obs
 endif
 
 # Win32
@@ -970,8 +942,7 @@ ASMEXT=.sw
 SMARTEXT=.slw
 STATICLIBEXT=.aw
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.w32
-ZIPSUFFIX=w32
+SHORTSUFFIX=w32
 endif
 
 # OS/2
@@ -985,8 +956,7 @@ SMARTEXT=.sl2
 STATICLIBPREFIX=
 STATICLIBEXT=.ao2
 SHAREDLIBEXT=.dll
-FPCMADE=fpcmade.os2
-ZIPSUFFIX=emx
+SHORTSUFFIX=os2
 ECHO=echo
 endif
 
@@ -999,7 +969,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.library
-FPCMADE=fpcmade.amg
+SHORTSUFFIX=amg
 endif
 
 # Atari
@@ -1010,7 +980,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=.ttp
-FPCMADE=fpcmade.ata
+SHORTSUFFIX=ata
 endif
 
 # BeOS
@@ -1022,8 +992,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.be
-ZIPSUFFIX=be
+SHORTSUFFIX=be
 endif
 
 # Solaris
@@ -1035,8 +1004,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.sun
-ZIPSUFFIX=sun
+SHORTSUFFIX=sun
 endif
 
 # QNX
@@ -1048,8 +1016,7 @@ OEXT=.o
 SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
-FPCMADE=fpcmade.qnx
-ZIPSUFFIX=qnx
+SHORTSUFFIX=qnx
 endif
 
 # Netware
@@ -1061,9 +1028,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nw
-ZIPSUFFIX=nw
 EXEEXT=.nlm
+SHORTSUFFIX=nw
 endif
 
 # Netware libc
@@ -1075,9 +1041,8 @@ ASMEXT=.s
 SMARTEXT=.sl
 STATICLIBEXT=.a
 SHAREDLIBEXT=.nlm
-FPCMADE=fpcmade.nwl
-ZIPSUFFIX=nwl
 EXEEXT=.nlm
+SHORTSUFFIX=nwl
 endif
 
 # MacOS
@@ -1090,12 +1055,33 @@ SMARTEXT=.sl
 STATICLIBEXT=.a
 EXEEXT=
 DEBUGSYMEXT=.xcoff
-FPCMADE=fpcmade.macos
+SHORTSUFFIX=mac
 endif
 
 #end of target specific settings
 endif
 
+# For 8.3 limited OS's the short suffixes
+# Otherwise use the full source/target names
+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
+
 [defaulttools]
 #####################################################################
 # Default Tools
@@ -1569,7 +1555,7 @@ $(COMPILER_TARGETDIR):
         $(COMPILER) $<
         $(EXECPPAS)
 
-%$(EXEEXT): %.pp 
+%$(EXEEXT): %.pp
         $(COMPILER) $<
         $(EXECPPAS)