fix zip names

docs/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/01/31]
+# Don't edit, this file is generated by FPCMake Version 1.9.8 [2005/02/07]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-sunos i386-qnx i386-netware i386-openbsd i386-wdosx i386-emx i386-watcom i386-netwlibc m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-sunos x86_64-linux x86_64-freebsd arm-linux
@@ -1719,25 +1719,26 @@ install:
 	@echo Choose install from:
 	@echo pdfinstall,htmlinstall,htmldosinstall
 	@exit
-psdist:
-	$(MAKE) zipinstall ZIPTARGET=psinstall
+pstar:
+	$(MAKE) zipinstall ZIPTARGET=psinstall UNIXHier=1 USETAR=y FULLZIPNAME=docs=fpcdocps
+pszip:
+	$(MAKE) zipinstall ZIPTARGET=psinstall UNIXHier= USEZIP=y FULLZIPNAME=docs=ps
 pdftar:
-	$(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier=1 USETAR=y
+	$(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier=1 USETAR=y FULLZIPNAME=fpcdoc
 pdfzip:
-	$(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier= USEZIP=y
+	$(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier= USEZIP=y FULLZIPNAME=docs-pdf
 dvidist:
-	$(MAKE) zipinstall ZIPTARGET=dviinstall
+	$(MAKE) zipinstall ZIPTARGET=dviinstall FULLZIPNAME=doc-dvi
 txtdist:
-	$(MAKE) zipinstall ZIPTARGET=txtinstall
+	$(MAKE) zipinstall ZIPTARGET=txtinstall FULLZIPNAME=doc-txt
 htmltar:
-	$(MAKE) zipinstall ZIPTARGET=htmlinstall USETAR=y
+	$(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier=1 USETAR=y FULLZIPNAME=fpcdochtml
 htmlzip:
-	$(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier= USEZIP=y
+	$(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-html
+psdist: pszip pstar
 pdfdist: pdfzip pdftar
 htmldist: htmlzip htmltar
 alldist: dvidist psdist txtdist pdfdist htmldist
-DOCPREFIX=doc
-BASEDIR=$(shell pwd)
 examples:
 	$(MAKE) -C crtex
 	$(MAKE) -C dosex

docs/Makefile.fpc

@@ -467,30 +467,36 @@ install:
         @echo pdfinstall,htmlinstall,htmldosinstall
         @exit
 
+
 #####################################################################
-# Archives
+# Distribution archives/packages
 #####################################################################
 
-psdist:
-        $(MAKE) zipinstall ZIPTARGET=psinstall
+pstar:
+        $(MAKE) zipinstall ZIPTARGET=psinstall UNIXHier=1 USETAR=y FULLZIPNAME=docs=fpcdocps
+
+pszip:
+        $(MAKE) zipinstall ZIPTARGET=psinstall UNIXHier= USEZIP=y FULLZIPNAME=docs=ps
 
 pdftar:
-        $(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier=1 USETAR=y
+        $(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier=1 USETAR=y FULLZIPNAME=fpcdoc
 
 pdfzip:
-        $(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier= USEZIP=y
+        $(MAKE) zipinstall ZIPTARGET=pdfinstall UNIXHier= USEZIP=y FULLZIPNAME=docs-pdf
 
 dvidist:
-        $(MAKE) zipinstall ZIPTARGET=dviinstall
+        $(MAKE) zipinstall ZIPTARGET=dviinstall FULLZIPNAME=doc-dvi
 
 txtdist:
-        $(MAKE) zipinstall ZIPTARGET=txtinstall
+        $(MAKE) zipinstall ZIPTARGET=txtinstall FULLZIPNAME=doc-txt
 
 htmltar:
-        $(MAKE) zipinstall ZIPTARGET=htmlinstall USETAR=y
+        $(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier=1 USETAR=y FULLZIPNAME=fpcdochtml
 
 htmlzip:
-        $(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier= USEZIP=y
+        $(MAKE) zipinstall ZIPTARGET=htmlinstall UNIXHier= USEZIP=y FULLZIPNAME=doc-html
+
+psdist: pszip pstar
 
 pdfdist: pdfzip pdftar
 
@@ -498,14 +504,6 @@ htmldist: htmlzip htmltar
 
 alldist: dvidist psdist txtdist pdfdist htmldist
 
-#####################################################################
-# Zips of htmls
-#####################################################################
-
-DOCPREFIX=doc
-BASEDIR=$(shell pwd)
-
-# html only, no htm
 
 #####################################################################
 # Examples
@@ -567,7 +565,10 @@ execute:
 
 #
 # $Log$
-# Revision 1.3  2005-02-06 21:02:12  peter
+# Revision 1.4  2005-02-07 20:39:19  peter
+# fix zip names
+#
+# Revision 1.3  2005/02/06 21:02:12  peter
 #   * updated for current rtl
 #
 # Revision 1.2  2005/01/10 22:49:56  armin