* 0.99.12b updates

  * merges

base/makefile.fpc

@@ -625,7 +625,7 @@ endif
 
 ifdef DATE
 DATESTR=$(shell $(DATE) +%Y%m%d)
-else
+else	
 DATESTR=
 endif
 
@@ -656,7 +656,7 @@ export GCCLIBDIR OTHERLIBDIR
 LOADEROFILES=$(addsuffix $(OEXT),$(LOADEROBJECTS))
 EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
 EXEOFILES=$(addsuffix $(OEXT),$(EXEOBJECTS))
-UNITFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
+UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
 UNITOFILES=$(addsuffix $(OEXT),$(UNITOBJECTS))
 UNITAFILES=$(addsuffix $(STATICLIBEXT),$(UNITOBJECTS))
 
@@ -682,7 +682,7 @@ endif
 
 fpc_loaders: $(LOADEROFILES)
 
-fpc_units: $(UNITFILES)
+fpc_units: $(UNITPPUFILES)
 
 fpc_exes: $(EXEFILES)
 
@@ -738,6 +738,15 @@ endif
 # Install rules
 #####################################################################
 
+# Create UnitInstallFiles
+override UNITINSTALLFILES=$(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES))
+ifdef EXTRAINSTALLUNITS
+override EXTRAINSTALLFILES+=$(wildcard $(addsuffix $(OEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAINSTALLUNITS)) $(addsuffix $(PPUEXT),$(EXTRAINSTALLUNITS)))
+ifneq ($(EXTRAINSTALLFILES),)
+override UNITINSTALLFILES+=$(EXTRAINSTALLFILES)
+endif
+endif
+
 fpc_showinstallfiles : all
 ifndef DEFAULTUNITS
 ifdef EXEOBJECTS
@@ -747,10 +756,10 @@ endif
 ifdef LOADEROBJECTS
 	$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(LOADEROFILES))
 endif
-ifdef UNITOBJECTS
-	$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(UNITFILES))
-	$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(UNITOFILES))
-endif
+# Show Units if unitobjects or extrainstallunits is set
+ifneq ($(UNITINSTALLFILES),)
+	$(ECHO) $(addprefix "\n"$(UNITINSTALLDIR)/,$(UNITINSTALLFILES))
+endif	
 
 fpc_install : all
 ifndef DEFAULTUNITS
@@ -767,15 +776,11 @@ ifdef LOADEROBJECTS
 	$(MKDIR) $(UNITINSTALLDIR)
 	$(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)
 endif
-ifdef UNITOBJECTS
+# Install Units if unitobjects or extrainstallunits is set
+ifneq ($(UNITINSTALLFILES),)
 	$(MKDIR) $(UNITINSTALLDIR)
-	$(INSTALL) $(UNITFILES) $(UNITINSTALLDIR)
-ifeq ($(SMARTLINK),YES)
-	$(INSTALL) $(LIBPREFIX)$(LIBNAME)$(LIBEXT) $(UNITINSTALLDIR)
-else
-	-$(INSTALL) $(UNITOFILES) $(UNITINSTALLDIR)
-endif
-endif
+	$(INSTALL) $(UNITINSTALLFILES) $(UNITINSTALLDIR)
+endif	
 
 # Target for the sharedlib install which is not avail for all targets
 ifdef inlinux
@@ -786,13 +791,13 @@ endif
 
 fpc_staticinstall: staticlib
 	$(MKDIR) $(STATIC_UNITINSTALLDIR)
-	$(INSTALL) $(UNITFILES) $(STATIC_UNITINSTALLDIR)
+	$(INSTALL) $(UNITINSTALLFILES) $(STATIC_UNITINSTALLDIR)
 	$(MKDIR) $(STATIC_LIBINSTALLDIR)
 	$(INSTALLEXE) *$(STATICLIBEXT) $(STATIC_LIBINSTALLDIR)
 
 fpc_sharedinstall: sharedlib
 	$(MKDIR) $(SHARED_UNITINSTALLDIR)
-	$(INSTALL) $(UNITFILES) $(SHARED_UNITINSTALLDIR)
+	$(INSTALL) $(UNITINSTALLFILES) $(SHARED_UNITINSTALLDIR)
 	$(MKDIR) $(SHARED_LIBINSTALLDIR)
 	$(INSTALLEXE) *$(SHAREDLIBEXT) $(SHARED_LIBINSTALLDIR)
 
@@ -868,18 +873,25 @@ endif
 # Clean rules
 #####################################################################
 
+# Create UnitCleanFiles
+override UNITCLEANFILES=$(wildcard $(UNITPPUFILES) $(UNITOFILES) $(UNITAFILES))
+ifdef EXTRACLEANUNITS
+override EXTRACLEANFILES=$(wildcard $(addsuffix $(OEXT),$(EXTRACLEANUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRACLEANUNITS)) $(addsuffix $(PPUEXT),$(EXTRACLEANUNITS)))
+ifneq ($(EXTRACLEANFILES),)
+override UNITCLEANFILES+=$(EXTRACLEANFILES)
+endif
+endif
+
 fpc_clean:
-ifdef UNITOBJECTS
-	-$(DEL) $(UNITOFILES) $(UNITAFILES) $(UNITFILES)
-endif	
 ifdef EXEOBJECTS
 	-$(DEL) $(EXEFILES) $(EXEOFILES)
 endif
 ifdef LOADEROBJECTS
 	-$(DEL) $(LOADEROFILES)
 endif
-ifdef EXTRAUNITS
-	-$(DEL) $(addsuffix $(OEXT),$(EXTRAUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAUNITS)) $(addsuffix $(PPUEXT),$(EXTRAUNITS)) 
+# Clean Units if unitobjects or extrainstallunits is set
+ifneq ($(UNITCLEANFILES),)
+	-$(DEL) $(UNITCLEANFILES)
 endif	
 	-$(DEL) $(PPAS) link.res log
 
@@ -971,11 +983,17 @@ fpc_objectinfo:
 	@$(ECHO)
 	@$(ECHO)  == Object info ==
 	@$(ECHO)
-	@$(ECHO)  LoaderObjects. $(LOADEROBJECTS)
-	@$(ECHO)  UnitObjects... $(UNITOBJECTS)
-	@$(ECHO)  ExeObjects.... $(EXEOBJECTS)
+	@$(ECHO)  LoaderObjects..... $(LOADEROBJECTS)
+	@$(ECHO)  UnitObjects....... $(UNITOBJECTS)
+	@$(ECHO)  ExeObjects........ $(EXEOBJECTS)
 	@$(ECHO)
-	@$(ECHO)  ExtraUnits.... $(EXTRAUNITS)
+	@$(ECHO)  ExtraCleanUnits... $(EXTRACLEANUNITS)
+	@$(ECHO)  ExtraInstallUnits. $(EXTRAINSTALLUNITS)
+	@$(ECHO)
+	@$(ECHO)  == Unit info ==
+	@$(ECHO)
+	@$(ECHO)  UnitInstallFiles. $(UNITINSTALLFILES)
+	@$(ECHO)  UnitCleanFiles... $(UNITCLEANFILES)
 	@$(ECHO)
 
 fpc_installinfo:
@@ -996,7 +1014,7 @@ fpc_installinfo:
 	@$(ECHO)  MsgInstallDir........ $(MSGINSTALLDIR)
 	@$(ECHO)  DocInstallDir........ $(DOCINSTALLDIR)
 	@$(ECHO)
-
+	
 # try to get the files in the currentdir
 PASFILES:=$(wildcard *.pas)
 PPFILES:=$(wildcard *.pp)
@@ -1026,7 +1044,11 @@ endif
 
 #
 # $Log$
-# Revision 1.37  1999-07-05 21:37:35  peter
+# Revision 1.38  1999-07-16 13:45:24  peter
+#   * 0.99.12b updates
+#   * merges
+#
+# Revision 1.37  1999/07/05 21:37:35  peter
 #   * display extraunits in info
 #
 # Revision 1.36  1999/07/01 18:20:01  jonas
@@ -1044,6 +1066,9 @@ endif
 # Revision 1.32  1999/06/11 13:31:14  hajny
 #   * fixes for OS/2
 #
+# Revision 1.31.2.4  1999/07/16 13:40:56  peter
+#   + extrainstallunits,extracleanunits
+#
 # Revision 1.31.2.3  1999/06/18 10:55:31  peter
 #   * version fixes
 #   * EXTRAUNITS to set extra units that are build and needs to be cleaned

install/debian/README.debian

@@ -4,12 +4,20 @@ Free Pascal for DEBIAN
 The Original site is
   http://tfdec1.fys.kuleuven.ac.be/~michael/fpc/
   
-Mirrored at  
+HTTP Mirrored at  
   http://www.brain.uni-freiburg.de/~klaus/fpc/
-  http://freepascal.zeuswpi.org/
+  http://www.zeus.rug.ac.be/freepascal/
   http://gd.tuwien.ac.at/languages/pascal/fpc/www/
   http://www.atlasz.com/freepascal/
   http://deadlock.et.tudelft.nl/~fpc/
   http://www.freepascal.sk/
+  http://ipbm.simr.pw.edu.pl/users/ftp-pub/mirrors/tfdec1.fys.kuleuven.ac.be/%257Emichael/fpc/
+
+FTP Mirrored at
+  ftp://ftp.epix.net/pub/languages/pascal/
+  ftp://ftp.techgnosis.net/pub/fpc/
+  ftp://ftp.fisek.com.tr/pub/fpc/
+  http://clubinfo.collegebdeb.qc.ca/nuitari/fpc/
+
 
 Peter Vreman <[email protected]>, Tue, 20 Mar 1999 12:00:00 +0200

install/debian/changelog

@@ -1,6 +1,12 @@
+fpc (0.99.12b-1) unstable; urgency=low
+
+  * New Upstream Release
+
+ -- Peter Vreman <[email protected]>  Thu, 10 Jun 1999 12:00:00 +0200
+  
 fpc (0.99.12a-1) unstable; urgency=low
 
-  * Initial Release.
+  * Initial Release
 
  -- Peter Vreman <[email protected]>  Thu, 10 Jun 1999 12:00:00 +0200
 

install/debian/control

@@ -6,8 +6,8 @@ Standards-Version: 2.5.1.0
 
 Package: fp-compiler
 Architecture: i386
-Depends: fp-rtl (= 0.99.12a-1)
-Recommends: fp-docs (= 0.99.12a-1)
+Depends: fp-rtl (= 0.99.12b-1)
+Recommends: fp-docs (= 0.99.12b-1)
 Suggests: fp-utils
 Replaces: fpc
 Description: Free Pascal Compiler
@@ -21,14 +21,14 @@ Description: Free Pascal Compiler
  
 Package: fp-rtl
 Architecture: i386
-Recommends: fp-compiler (= 0.99.12a-1)
+Recommends: fp-compiler (= 0.99.12b-1)
 Replaces: fpc
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
  
 Package: fp-utils
 Architecture: i386
-Recommends: fp-compiler (= 0.99.12a-1)
+Recommends: fp-compiler (= 0.99.12b-1)
 Replaces: fpc
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
@@ -41,38 +41,37 @@ Description: Free Pascal Utils
 
 Package: fp-docs
 Architecture: all
-Recommends: fp-docs (= 0.99.12a-1)
 Replaces: fpc
 Description: Free Pascal Documentation
  Documentation for the Free Pascal Compiler.
   
 Package: fp-fcl
 Architecture: i386
-Depends: fp-compiler (= 0.99.12a-1), fp-rtl (= 0.99.12a-1)
+Depends: fp-compiler (= 0.99.12b-1), fp-rtl (= 0.99.12b-1)
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
  
 Package: fp-gtk
 Architecture: i386
-Depends: fp-compiler (= 0.99.12a-1), fp-rtl (= 0.99.12a-1)
+Depends: fp-compiler (= 0.99.12b-1), fp-rtl (= 0.99.12b-1)
 Description: Free Pascal GTK Bindings
  GTK 1.2.x bindings for the Free Pascal Compiler.
  
 Package: fp-api
 Architecture: i386
-Depends: fp-compiler (= 0.99.12a-1), fp-rtl (= 0.99.12a-1)
+Depends: fp-compiler (= 0.99.12b-1), fp-rtl (= 0.99.12b-1)
 Description: Free Pascal API Units
  API Units needed by Free Vision.
  
 Package: fp-fv
 Architecture: i386
-Depends: fp-compiler (= 0.99.12a-1), fp-rtl (= 0.99.12a-1), fp-api (= 0.99.12a-1)
+Depends: fp-compiler (= 0.99.12b-1), fp-rtl (= 0.99.12b-1), fp-api (= 0.99.12b-1)
 Description: Free Pascal Free Vision
  Free Turbo Vision clone for the Free Pascal Compiler.
  
 Package: fp-extra
 Architecture: i386
-Depends: fp-compiler (= 0.99.12a-1), fp-rtl (= 0.99.12a-1)
+Depends: fp-compiler (= 0.99.12b-1), fp-rtl (= 0.99.12b-1)
 Description: Free Pascal Extra Packages
  Some different packages for the Free Pascal Compiler
  Bindings to libraries:

install/debian/fp-api.files

@@ -6,6 +6,7 @@
 /usr/lib/fpc/0.99.12/units/linux/mouse.ppu 
 /usr/lib/fpc/0.99.12/units/linux/filectrl.ppu 
 /usr/lib/fpc/0.99.12/units/linux/filesys.ppu
+/usr/lib/fpc/0.99.12/units/linux/terminfo.ppu
 
 /usr/lib/fpc/0.99.12/units/linux/common.o 
 /usr/lib/fpc/0.99.12/units/linux/callspec.o 
@@ -14,3 +15,4 @@
 /usr/lib/fpc/0.99.12/units/linux/mouse.o 
 /usr/lib/fpc/0.99.12/units/linux/filectrl.o 
 /usr/lib/fpc/0.99.12/units/linux/filesys.o
+/usr/lib/fpc/0.99.12/units/linux/terminfo.o

install/debian/fp-docs.doc-base

@@ -5,6 +5,5 @@ Abstract: Documentation for the Free Pascal Compiler.
  .
 Section: Development
 
-Format: HTML
-Index: /usr/doc/fp-docs/fpctoc.html
-Files: /usr/doc/fp-docs/*.html
+Format: PDF
+Files: /usr/doc/fp-docs/*.pdf

install/debian/fp-docs.docs

@@ -1,7 +1 @@
-debian/tmp/usr/doc/fpc/0.99.12/user/
-debian/tmp/usr/doc/fpc/0.99.12/prog/
-debian/tmp/usr/doc/fpc/0.99.12/ref/
-debian/tmp/usr/doc/fpc/0.99.12/units/
-debian/tmp/usr/doc/fpc/0.99.12/buttons/
-debian/tmp/usr/doc/fpc/0.99.12/search/
-debian/tmp/usr/doc/fpc/0.99.12/fpctoc.html
+debian/tmp/usr/doc/fpc/0.99.12/

install/debian/fp-extra.files

@@ -1,30 +1,30 @@
-/usr/lib/fpc/0.99.12/units/ibase.ppu
-/usr/lib/fpc/0.99.12/units/ibase.o
-/usr/lib/fpc/0.99.12/units/mysql_com.ppu
-/usr/lib/fpc/0.99.12/units/mysql_version.ppu
-/usr/lib/fpc/0.99.12/units/mysql.ppu
-/usr/lib/fpc/0.99.12/units/mysql_com.o
-/usr/lib/fpc/0.99.12/units/mysql_version.o
-/usr/lib/fpc/0.99.12/units/mysql.o
-/usr/lib/fpc/0.99.12/units/uncgi.ppu
-/usr/lib/fpc/0.99.12/units/uncgi.o
-/usr/lib/fpc/0.99.12/units/utmp.ppu
-/usr/lib/fpc/0.99.12/units/utmp.o
-/usr/lib/fpc/0.99.12/units/inet.ppu
-/usr/lib/fpc/0.99.12/units/inet.o
-/usr/lib/fpc/0.99.12/units/dllist.ppu
-/usr/lib/fpc/0.99.12/units/postgres.ppu
-/usr/lib/fpc/0.99.12/units/dllist.o
-/usr/lib/fpc/0.99.12/units/postgres.o
-/usr/lib/fpc/0.99.12/units/ncurses.ppu
-/usr/lib/fpc/0.99.12/units/ncurses.o
-/usr/lib/fpc/0.99.12/units/x.ppu
-/usr/lib/fpc/0.99.12/units/xresource.ppu
-/usr/lib/fpc/0.99.12/units/xlib.ppu
-/usr/lib/fpc/0.99.12/units/xutil.ppu
-/usr/lib/fpc/0.99.12/units/forms.ppu
-/usr/lib/fpc/0.99.12/units/xlib.o
-/usr/lib/fpc/0.99.12/units/forms.o
-/usr/lib/fpc/0.99.12/units/svgalib.ppu
-/usr/lib/fpc/0.99.12/units/vgamouse.ppu
-/usr/lib/fpc/0.99.12/units/svgalib.o
+/usr/lib/fpc/0.99.12/units/linux/ibase.ppu
+/usr/lib/fpc/0.99.12/units/linux/ibase.o
+/usr/lib/fpc/0.99.12/units/linux/mysql_com.ppu
+/usr/lib/fpc/0.99.12/units/linux/mysql_version.ppu
+/usr/lib/fpc/0.99.12/units/linux/mysql.ppu
+/usr/lib/fpc/0.99.12/units/linux/mysql_com.o
+/usr/lib/fpc/0.99.12/units/linux/mysql_version.o
+/usr/lib/fpc/0.99.12/units/linux/mysql.o
+/usr/lib/fpc/0.99.12/units/linux/uncgi.ppu
+/usr/lib/fpc/0.99.12/units/linux/uncgi.o
+/usr/lib/fpc/0.99.12/units/linux/utmp.ppu
+/usr/lib/fpc/0.99.12/units/linux/utmp.o
+/usr/lib/fpc/0.99.12/units/linux/inet.ppu
+/usr/lib/fpc/0.99.12/units/linux/inet.o
+/usr/lib/fpc/0.99.12/units/linux/dllist.ppu
+/usr/lib/fpc/0.99.12/units/linux/postgres.ppu
+/usr/lib/fpc/0.99.12/units/linux/dllist.o
+/usr/lib/fpc/0.99.12/units/linux/postgres.o
+/usr/lib/fpc/0.99.12/units/linux/ncurses.ppu
+/usr/lib/fpc/0.99.12/units/linux/ncurses.o
+/usr/lib/fpc/0.99.12/units/linux/x.ppu
+/usr/lib/fpc/0.99.12/units/linux/xresource.ppu
+/usr/lib/fpc/0.99.12/units/linux/xlib.ppu
+/usr/lib/fpc/0.99.12/units/linux/xutil.ppu
+/usr/lib/fpc/0.99.12/units/linux/forms.ppu
+/usr/lib/fpc/0.99.12/units/linux/xlib.o
+/usr/lib/fpc/0.99.12/units/linux/forms.o
+/usr/lib/fpc/0.99.12/units/linux/svgalib.ppu
+/usr/lib/fpc/0.99.12/units/linux/vgamouse.ppu
+/usr/lib/fpc/0.99.12/units/linux/svgalib.o

install/debian/fp-fcl.files

@@ -1,8 +1,16 @@
-
-/usr/lib/fpc/0.99.12/units/linux/classes.ppu 
-/usr/lib/fpc/0.99.12/units/linux/inifiles.ppu 
-/usr/lib/fpc/0.99.12/units/linux/ezcgi.ppu
-
-/usr/lib/fpc/0.99.12/units/linux/classes.o 
-/usr/lib/fpc/0.99.12/units/linux/inifiles.o 
+/usr/lib/fpc/0.99.12/units/linux/classes.o
+/usr/lib/fpc/0.99.12/units/linux/classes.ppu
+/usr/lib/fpc/0.99.12/units/linux/dom.o
+/usr/lib/fpc/0.99.12/units/linux/dom.ppu
 /usr/lib/fpc/0.99.12/units/linux/ezcgi.o
+/usr/lib/fpc/0.99.12/units/linux/ezcgi.ppu
+/usr/lib/fpc/0.99.12/units/linux/inifiles.o
+/usr/lib/fpc/0.99.12/units/linux/inifiles.ppu
+/usr/lib/fpc/0.99.12/units/linux/pipes.o
+/usr/lib/fpc/0.99.12/units/linux/pipes.ppu
+/usr/lib/fpc/0.99.12/units/linux/xmlcfg.o
+/usr/lib/fpc/0.99.12/units/linux/xmlcfg.ppu
+/usr/lib/fpc/0.99.12/units/linux/xmlread.o
+/usr/lib/fpc/0.99.12/units/linux/xmlread.ppu
+/usr/lib/fpc/0.99.12/units/linux/xmlwrite.o
+/usr/lib/fpc/0.99.12/units/linux/xmlwrite.ppu

install/debian/fp-fv.files

@@ -25,6 +25,7 @@
 /usr/lib/fpc/0.99.12/units/linux/calendar.ppu 
 /usr/lib/fpc/0.99.12/units/linux/helpfile.ppu 
 /usr/lib/fpc/0.99.12/units/linux/editors.ppu
+/usr/lib/fpc/0.99.12/units/linux/tabs.ppu
 
 /usr/lib/fpc/0.99.12/units/linux/validate.o 
 /usr/lib/fpc/0.99.12/units/linux/drivers.o 
@@ -50,3 +51,4 @@
 /usr/lib/fpc/0.99.12/units/linux/calendar.o 
 /usr/lib/fpc/0.99.12/units/linux/helpfile.o 
 /usr/lib/fpc/0.99.12/units/linux/editors.o
+/usr/lib/fpc/0.99.12/units/linux/tabs.o

install/debian/rules

@@ -8,6 +8,7 @@ export FPCDIR=
 # Get current dir
 PWD=$(shell pwd)
 
+INSTALL_VERSION=0.99.12
 BUILD_DIR=$(PWD)/debian/build
 INSTALL_DIR=$(PWD)/debian/tmp
 NEWPP=$(PWD)/compiler/ppc386
@@ -41,7 +42,7 @@ cleanbin:
 	dh_testroot
 
 	rm -f buildbin-stamp installbin-stamp
-	rm -rf ${BUILD_DIR}
+	rm -rf $(BUILD_DIR)
 	
 	$(MAKE) compiler_clean
 	$(MAKE) rtl_clean
@@ -63,19 +64,19 @@ installbin-stamp: buildbin
 	dh_clean
 
 # Specify the compiler to use so installing will do correctly
-	$(MAKE) compiler_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-	$(MAKE) rtl_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-	$(MAKE) utils_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-
-	$(MAKE) base_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-	$(MAKE) man_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-	$(MAKE) demo_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-
-	$(MAKE) fcl_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-	$(MAKE) gtk_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-	$(MAKE) api_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-	$(MAKE) fv_install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
-	$(MAKE) -C packages install PP=$(NEWPP) PREFIXINSTALLDIR=${INSTALL_DIR}/usr
+	$(MAKE) compiler_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) rtl_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) utils_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+
+	$(MAKE) base_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) man_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) demo_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+
+	$(MAKE) fcl_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) gtk_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) api_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) fv_install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+	$(MAKE) -C packages install PP=$(NEWPP) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
 	
 	touch installbin-stamp
 
@@ -88,7 +89,7 @@ builddoc-stamp:
 	@echo "--- Building Documentation"
 	dh_testdir
 
-	$(MAKE) -C docs html
+	$(MAKE) -C docs pdf
 
 	touch builddoc-stamp
 
@@ -99,7 +100,7 @@ installdoc-stamp: builddoc
 	dh_testroot
 	dh_clean
 
-	$(MAKE) -C docs install DOCINSTALLDIR=${INSTALL_DIR}/usr/doc/fpc/0.99.12/
+	$(MAKE) -C docs pdfinstall DOCINSTALLDIR=$(INSTALL_DIR)/usr/doc/fpc/$(INSTALL_VERSION)/
 	
 	touch installdoc-stamp
 
@@ -109,7 +110,7 @@ cleandoc:
 	dh_testroot
 
 	rm -f builddoc-stamp installdoc-stamp
-	rm -rf ${BUILD_DIR}
+	rm -rf $(BUILD_DIR)
 
 	$(MAKE) -C docs clean
 
@@ -186,7 +187,7 @@ fp-docs: installdoc
 	dh_installdocs		-p$@ -P$(BUILD_DIR)/$@
 	dh_installchangelogs 	-p$@ -P$(BUILD_DIR)/$@
 	dh_movefiles		-p$@ -P$(BUILD_DIR)/$@
-	dh_compress		-p$@ -P$(BUILD_DIR)/$@
+#	dh_compress		-p$@ -P$(BUILD_DIR)/$@
 	dh_fixperms		-p$@ -P$(BUILD_DIR)/$@
 	dh_installdeb	 	-p$@ -P$(BUILD_DIR)/$@
 	dh_gencontrol	 	-p$@ -P$(BUILD_DIR)/$@

packages/forms/Makefile

@@ -74,8 +74,6 @@ endif
         
 all: testfpcmake fpc_all
 
-clean: testfpcmake fpc_clean
-
 install: testfpcmake fpc_install
 
 info: testfpcmake fpc_info
@@ -136,6 +134,9 @@ endif
 # Dependencies
 #####################################################################
 
+clean: testfpcmake fpc_clean
+	$(DEL) forms$(PASEXT)
+
 forms$(PPUEXT): forms-$(FORMSVERSION)$(PASEXT) x$(PPUEXT) xresource$(PPUEXT) xlib$(PPUEXT)\
               xutil$(PPUEXT)
 	ln -sf forms-$(FORMSVERSION)$(PASEXT) forms$(PASEXT)
@@ -143,7 +144,11 @@ forms$(PPUEXT): forms-$(FORMSVERSION)$(PASEXT) x$(PPUEXT) xresource$(PPUEXT) xli
 
 #
 # $Log$
-# Revision 1.1  1999-05-12 00:11:25  michael
+# Revision 1.2  1999-07-16 13:45:36  peter
+#   * 0.99.12b updates
+#   * merges
+#
+# Revision 1.1  1999/05/12 00:11:25  michael
 # initial import
 #
 # Revision 1.1  1999/03/16 00:50:29  peter

utils/Makefile

@@ -28,7 +28,7 @@ DEFAULTFPCDIR=..
 EXEOBJECTS=ppudump ppumove ppdep ptop
 UNITOBJECTS=
 
-EXTRAUNITS=ppu ptopu
+EXTRACLEANUNITS=ppu ptopu
 
 #####################################################################
 # Common targets
@@ -134,9 +134,16 @@ h2pas_install:
 
 #
 # $Log$
-# Revision 1.2  1999-06-18 11:03:13  peter
+# Revision 1.3  1999-07-16 13:45:37  peter
+#   * 0.99.12b updates
+#   * merges
+#
+# Revision 1.2  1999/06/18 11:03:13  peter
 #   * merged
 #
+# Revision 1.1.2.2  1999/07/16 13:40:58  peter
+#   + extrainstallunits,extracleanunits
+#
 # Revision 1.1.2.1  1999/06/18 10:55:36  peter
 #   * version fixes
 #   * EXTRAUNITS to set extra units that are build and needs to be cleaned

utils/h2pas/Makefile

@@ -34,7 +34,7 @@ PASEXT=.pas
 EXEOBJECTS=h2pas
 UNITOBJECTS=
 
-EXTRAUNITS=options lexlib scan yacclib converu
+EXTRACLEANUNITS=options lexlib scan yacclib converu
 
 
 #####################################################################
@@ -149,9 +149,16 @@ endif
 
 #
 # $Log$
-# Revision 1.2  1999-06-18 11:03:14  peter
+# Revision 1.3  1999-07-16 13:45:38  peter
+#   * 0.99.12b updates
+#   * merges
+#
+# Revision 1.2  1999/06/18 11:03:14  peter
 #   * merged
 #
+# Revision 1.1.2.2  1999/07/16 13:40:59  peter
+#   + extrainstallunits,extracleanunits
+#
 # Revision 1.1.2.1  1999/06/18 10:55:37  peter
 #   * version fixes
 #   * EXTRAUNITS to set extra units that are build and needs to be cleaned