From 86089b3ab4c73bfca522303240b58ee32cf66e6a Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Tue, 31 Mar 1998 19:59:25 +0000
Subject: [PATCH]   * rpm fixed for buttons

---
 compiler/fpcspec |  9 ++++-----
 docs/Makefile    | 43 +++++++++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/compiler/fpcspec b/compiler/fpcspec
index 80ae1a42a4..8868a398bf 100644
--- a/compiler/fpcspec
+++ b/compiler/fpcspec
@@ -1,19 +1,18 @@
 Name: fpc
-Version: 0.99.0
+Version: 0.99.5
 Release: 1
 ExclusiveArch: i386
 Copyright: GPL
 Group: Development/Languages
-Source: fpc-0.99.0-src.tar.gz
+Source: fpc-0.99.5-src.tar.gz
 Summary: Free Pascal Compiler
 Packager: Peter Vreman (pfv@worldonline.nl)
 URL: http://www.brain.uni-freiburg.de/~klaus/fpk-pas/
 %description
 The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi II compatible
 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library.
-Some extensions are added to the language, like function overloading. It can
-create shared libraries and allowes linking with (shared) C libraries.
-
+Some extensions are added to the language, like function overloading. Shared
+libraries can be linked and created.
 
 %define package fpc-%{PACKAGE_VERSION}
 %define bindir /usr/bin
diff --git a/docs/Makefile b/docs/Makefile
index 69040617d3..f5ad6e2db7 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -19,7 +19,7 @@
 
 # Where do you want the html files to be put ?
 ifndef DOCINSTALLDIR
-DOCINSTALLDIR=/usr/doc/fpc-0.99.0
+DOCINSTALLDIR=/usr/doc/fpc-0.99.5
 endif 
 
 #
@@ -38,11 +38,17 @@ endif
 
 # Options for converter
 ifndef LATEX2HTMLOPTS
-LATEX2HTMLOPTS = -ascii_mode -no_reuse -up_url "../fpctoc.html"\
+LATEX2HTMLOPTS = -no_reuse -up_url "../fpctoc.html"\
                  -up_title "Free Pascal manuals" -contents_in_navigation\
                  -html_version 3.0
 endif
 
+# Ascii mode ? (i.e. no pics)
+ifndef ASCIIMODE
+ASCIIMODE=NO
+#ASCIIMODE=YES
+endif
+
 # DVI to PS converter
 ifndef DVIPS
 DVIPS=dvips
@@ -78,6 +84,11 @@ PDF = $(addsuffix .pdf, $(HTML))
 
 CHAPTERS = $(addsuffix .tex, crt dos getopts go32 graph linux printer strings)
 
+# Check if ascii-mode requested
+ifeq ($(ASCIIMODE),YES)
+LATEX2HTMLOPTS:=$(LATEX2HTMLOPTS) -ascii_mode
+endif
+
 #####################################################################
 # Conversion from types
 #####################################################################
@@ -165,29 +176,40 @@ ps : dvi $(PS)
 
 pdf : $(PDF)
 
-user:
+user: user.chk
+
+user.chk: user.tex
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 2 -link 2\
          -t "User's guide for Free Pascal" user.tex
 	sed -f foot.sed <user/footnode.html >user/footnote.html
 	mv user/footnote.html user/footnode.html
 	rm -f user/labels.pl user/internals.pl user/.*.pag user/.*.dir
 	rm -f user/images.* user/*.log
+	touch user.chk
 	
-units: unitex.chk
+units: units.chk
+
+units.chk: units.tex unitex.chk
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 3 -link 2\
         -t "Unit reference for Free Pascal" units.tex
 	sed -f foot.sed <units/footnode.html >units/footnote.html
 	mv units/footnote.html units/footnode.html
 	rm -f units/labels.pl units/internals.pl units/.*.pag units/.*.dir
+	touch units.chk
 
-ref: refex.chk
+ref: ref.chk
+
+ref.chk: refex.chk ref.tex
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 3 -link 2\
         -t "Free Pascal reference guide" ref.tex
 	sed -f foot.sed <ref/footnode.html >ref/footnote.html
 	mv ref/footnote.html ref/footnode.html
 	rm -f ref/labels.pl ref/internals.pl ref/.*.pag ref/.*.dir
-	
-prog:
+	touch ref.chk	
+
+prog: prog.chk
+
+prog.chk: prog.tex 
 	$(LATEX2HTML) $(LATEX2HTMLOPTS) -split 2 -link 2\
         -t "Free Pascal programmers guide" prog.tex
 	sed -f foot.sed <prog/footnode.html >prog/footnote.html
@@ -209,12 +231,13 @@ all-formats: ps txt pdf html
 	
 install:
 	install -d -m 755 $(DOCINSTALLDIR)
-	cp -R $(HTML) $(DOCINSTALLDIR)
 	cp fpctoc.html $(DOCINSTALLDIR)
+	cp -R buttons $(DOCINSTALLDIR)
+	cp -R $(HTML) $(DOCINSTALLDIR)
 
 www-install: psdist htmldist htm
-	rcp fpcdoc.zip fpcdocps.zip fpcdocps.tar.gz fpcdoc.tar.gz tfdec1:htdocs/fpk
-	rsh tfdec1 '(cd htdocs/fpk/docs ; /usr/local/bin/tar -xzf ../fpcdoc.tar.gz)'
+	scp fpcdoc.zip fpcdocps.zip fpcdocps.tar.gz fpcdoc.tar.gz tfdec1:htdocs/fpk
+	ssh tfdec1 '(cd htdocs/fpk/docs ; /usr/local/bin/tar -xzf ../fpcdoc.tar.gz)'
 
 #####################################################################
 # Distribution