* updates for new makefiles

install/debian/changelog

@@ -1,4 +1,4 @@
-fpc (1.0.5-1) unstable; urgency=low
+fpc (1.0.5-0) unstable; urgency=low
 
   * Snapshot release
 

install/debian/control

@@ -1,15 +1,14 @@
 Source: fpc
 Section: devel
 Priority: optional
-Architecture: i386
 Maintainer: Ulf Jaenicke-Roessler <[email protected]>
 Standards-Version: 3.1.1
 Build-Depends: fp-compiler, debhelper, tetex-bin, awk
 
 Package: fp-compiler
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
-Suggests: fp-utils, fp-docs (>= 1.0.3)
+Depends: fp-units-rtl (= 1.0.5-0)
+Suggests: fp-utils, fp-docs (>= 1.0.5)
 Replaces: fpc
 Description: Free Pascal Compiler
  The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit
@@ -22,7 +21,7 @@ Description: Free Pascal Compiler
 
 Package: fp-utils
 Architecture: i386
-Recommends: fp-compiler (= 1.0.3-0.20001206.1)
+Recommends: fp-compiler (= 1.0.5-0)
 Replaces: fpc
 Description: Free Pascal Utils
  This package contains some handy utils for usage with the Free Pascal
@@ -46,14 +45,15 @@ Description: Free Pascal Documentation
 
 Package: fp-units-rtl
 Architecture: i386
-Recommends: fp-compiler (= 1.0.3-0.20001206.1)
-Replaces: fpc, fp-rtl
+Recommends: fp-compiler (= 1.0.5-0)
+Replaces: fpc, fp-rtl, fp-units-api
+Provides: fp-units-api
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
 
 Package: fp-units-base
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Description: Free Pascal base units
  Free Pascal units for common libraries, some of these units are also
  required by the Free Component Library :
@@ -63,37 +63,31 @@ Description: Free Pascal base units
 
 Package: fp-units-fcl
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1), fp-units-base (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0), fp-units-base (= 1.0.5-0)
 Replaces: fp-fcl
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
 
-Package: fp-units-api
-Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
-Replaces: fp-api
-Description: Free Pascal API units
- Free Pascal units for console keyboard,mouse,video and file handling.
-
 Package: fp-units-gtk
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Replaces: fp-gtk
 Description: Free Pascal units for GTK 1.2.x
  Free Pascal units and examples to create programs with GTK 1.2.x
 
 Package: fp-units-db
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Description: Free Pascal units for some database libraries
  Free Pascal units with bindings for:
   - Mysql
   - Interbase
   - Postgres
+  - Oracle
 
 Package: fp-units-gfx
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1), fp-units-base (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0), fp-units-base (= 1.0.5-0)
 Description: Free Pascal units for some graphics libraries
  Free Pascal units with bindings for:
   - Forms 0.88
@@ -103,7 +97,7 @@ Description: Free Pascal units for some graphics libraries
 
 Package: fp-units-net
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Description: Free Pascal units for networking
  Free Pascal units for creating network tools:
   - Inet unit for easier tcp/ip handling
@@ -111,7 +105,7 @@ Description: Free Pascal units for networking
 
 Package: fp-units-misc
 Architecture: i386
-Depends: fp-units-rtl (= 1.0.3-0.20001206.1)
+Depends: fp-units-rtl (= 1.0.5-0)
 Description: Free Pascal miscellaneous units
  Free Pascal miscellaneous units for:
   - Utmp

install/debian/control.in

@@ -1,7 +1,6 @@
 Source: fpc
 Section: devel
 Priority: optional
-Architecture: i386
 Maintainer: Ulf Jaenicke-Roessler <[email protected]>
 Standards-Version: 3.1.1
 Build-Depends: fp-compiler, debhelper, tetex-bin, awk
@@ -47,7 +46,8 @@ Description: Free Pascal Documentation
 Package: fp-units-rtl
 Architecture: i386
 Recommends: fp-compiler (= %{packageversion})
-Replaces: fpc, fp-rtl
+Replaces: fpc, fp-rtl, fp-units-api
+Provides: fp-units-api
 Description: Free Pascal Runtime Library
  Runtime Libraries for the Free Pascal Compiler.
 
@@ -68,13 +68,6 @@ Replaces: fp-fcl
 Description: Free Pascal Free Component Library
  Free Component Library for the Free Pascal Compiler.
 
-Package: fp-units-api
-Architecture: i386
-Depends: fp-units-rtl (= %{packageversion})
-Replaces: fp-api
-Description: Free Pascal API units
- Free Pascal units for console keyboard,mouse,video and file handling.
-
 Package: fp-units-gtk
 Architecture: i386
 Depends: fp-units-rtl (= %{packageversion})
@@ -90,6 +83,7 @@ Description: Free Pascal units for some database libraries
   - Mysql
   - Interbase
   - Postgres
+  - Oracle
 
 Package: fp-units-gfx
 Architecture: i386

install/debian/fp-units-base.files.in

@@ -1,28 +1,6 @@
 /usr/share/doc/fp-units-base
 
-/usr/lib/fpc/%{fpcversion}/units/linux/zlib.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libzlib.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/zlib.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/ncurses.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/panel.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncrt.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ocrt.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libocrt.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ocrt.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libncrt.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncrt.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libncurses.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ncurses.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/x.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/xlib.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/xutil.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/xresource.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/regexpr.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libregexpr.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/regexpr.o
+/usr/lib/fpc/%{fpcversion}/units/linux/paszlib
+/usr/lib/fpc/%{fpcversion}/units/linux/ncurses
+/usr/lib/fpc/%{fpcversion}/units/linux/x11
+/usr/lib/fpc/%{fpcversion}/units/linux/regexpr

install/debian/fp-units-db.files.in

@@ -1,26 +1,6 @@
 /usr/share/doc/fp-units-db
 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libmysql.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libmysql_version.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_version.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libmysql_com.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/mysql_com.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase40.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase60.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libibase40.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ibase40.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/dllist.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/postgres.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libpostgres.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/postgres.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libdllist.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/dllist.o
+/usr/lib/fpc/%{fpcversion}/units/linux/mysql
+/usr/lib/fpc/%{fpcversion}/units/linux/ibase
+/usr/lib/fpc/%{fpcversion}/units/linux/postgres
+/usr/lib/fpc/%{fpcversion}/units/linux/oracle

install/debian/fp-units-gfx.files.in

@@ -1,29 +1,10 @@
 /usr/share/doc/fp-units-gfx
 
-/usr/lib/fpc/%{fpcversion}/units/linux/gl.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/glut.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libglut.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/glut.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libgl.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/gl.o
+/usr/lib/fpc/%{fpcversion}/units/linux/opengl
+/usr/lib/fpc/%{fpcversion}/units/linux/forms
+/usr/lib/fpc/%{fpcversion}/units/linux/svgalib
+/usr/lib/fpc/%{fpcversion}/units/linux/ggi
+/usr/lib/fpc/%{fpcversion}/units/linux/libgd
+/usr/lib/fpc/%{fpcversion}/units/linux/libpng
 
 /usr/bin/fd2pascal
-
-/usr/lib/fpc/%{fpcversion}/units/linux/forms.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libforms.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/forms.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/svgalib.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/vgamouse.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libsvgalib.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/svgalib.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/gii.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi2d.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libggi.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ggi.o

install/debian/fp-units-gtk.files.in

@@ -1,13 +1,3 @@
 /usr/share/doc/fp-units-gtk
 
-/usr/lib/fpc/%{fpcversion}/units/linux/glib.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/gmodule.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/gdk.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/gtk.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/glib.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libglib.a
-/usr/lib/fpc/%{fpcversion}/units/linux/gdk.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libgdk.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/gtk.o
-/usr/lib/fpc/%{fpcversion}/units/linux/libgtk.a
+/usr/lib/fpc/%{fpcversion}/units/linux/gtk

install/debian/fp-units-misc.files.in

@@ -1,87 +1,8 @@
 /usr/share/doc/fp-units-misc
 
-/usr/lib/fpc/%{fpcversion}/units/linux/cmem.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libcmem.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/cmem.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/utmp.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libutmp.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/utmp.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/systemlog.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libsystemlog.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/systemlog.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbint.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libgdbcon.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbcon.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/gdbint.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrc.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrcasm.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inffast.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inftrees.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infutil.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/strutils.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/trees.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zcompres.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zdeflate.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zinflate.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zbase.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzutil.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zutil.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzuncompr.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zuncompr.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzbase.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zbase.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzinflate.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zinflate.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzdeflate.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zdeflate.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libzcompres.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/zcompres.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libtrees.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/trees.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libstrutils.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/strutils.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfutil.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infutil.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinftrees.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inftrees.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinffast.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/inffast.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfcodes.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infcodes.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libinfblock.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/infblock.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzio.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzio.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzcrcasm.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrcasm.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libgzcrc.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/gzcrc.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libadler.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/adler.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/libpaszlib.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/paszlib/paszlib.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.ppu 
-/usr/lib/fpc/%{fpcversion}/units/linux/unzip.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libunzip.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/unzip.o 
-/usr/lib/fpc/%{fpcversion}/units/linux/libziptypes.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/ziptypes.o
+/usr/lib/fpc/%{fpcversion}/units/linux/cmem
+/usr/lib/fpc/%{fpcversion}/units/linux/utmp
+/usr/lib/fpc/%{fpcversion}/units/linux/zlib
+/usr/lib/fpc/%{fpcversion}/units/linux/syslog
+/usr/lib/fpc/%{fpcversion}/units/linux/gdbint
+/usr/lib/fpc/%{fpcversion}/units/linux/unzip

install/debian/fp-units-net.files.in

@@ -1,11 +1,4 @@
 /usr/share/doc/fp-units-net
 
-/usr/lib/fpc/%{fpcversion}/units/linux/inet.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libinet.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/inet.o
-
-/usr/lib/fpc/%{fpcversion}/units/linux/uncgi.ppu
-
-/usr/lib/fpc/%{fpcversion}/units/linux/libuncgi.a 
-/usr/lib/fpc/%{fpcversion}/units/linux/uncgi.o
+/usr/lib/fpc/%{fpcversion}/units/linux/inet
+/usr/lib/fpc/%{fpcversion}/units/linux/uncgi

install/debian/fp-utils.files.in

@@ -10,6 +10,7 @@
 /usr/bin/plex
 /usr/bin/pyacc
 /usr/bin/h2pas
+/usr/bin/h2paspp
 /usr/bin/postw32
 /usr/bin/fpcmake
 /usr/bin/fprcp

install/debian/rules

@@ -14,12 +14,12 @@ PWD:=$(shell pwd)
 BUILD_DIR=$(PWD)/debian/build
 INSTALL_DIR=$(PWD)/debian/tmp
 DOC_DIR=$(INSTALL_DIR)/usr/share/doc
+EXAMPLE_TEMP=$(INSTALL_DIR)/usr/doc/fpc-$(FPCVERSION)/examples
 # Get utils
 NEWPP=$(PWD)/compiler/ppc386
-NEWPPUFILES=$(PWD)/utils/ppufiles
 # Create default options
 BUILDOPTS=PP=$(NEWPP)
-INSTALLOPTS=PP=$(NEWPP) PPUFILES=$(NEWPPUFILES) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr
+INSTALLOPTS=PP=$(NEWPP) INSTALL_PREFIX=$(INSTALL_DIR)/usr
 
 export DH_COMPAT=2
 # export DH_VERBOSE=1
@@ -40,10 +40,9 @@ clean:
 
 	$(MAKE) compiler_distclean
 	$(MAKE) rtl_distclean
+	$(MAKE) packages_distclean
 	$(MAKE) fcl_distclean
-	$(MAKE) api_distclean
 	$(MAKE) utils_distclean
-	$(MAKE) packages_distclean
 
 	$(MAKE) -C docs clean
 
@@ -81,11 +80,9 @@ build-arch-stamp: debian-files-stamp
 # First make a new Compiler and RTL using a make cycle
 	$(MAKE) compiler_cycle
 	$(MAKE) rtl_clean rtl_smart $(BUILDOPTS)
-	$(MAKE) fcl_smart $(BUILDOPTS)
-	$(MAKE) api_smart $(BUILDOPTS)
 	$(MAKE) packages_smart $(BUILDOPTS)
+	$(MAKE) fcl_smart $(BUILDOPTS)
 	$(MAKE) utils_all $(BUILDOPTS)
-	$(MAKE) compiler_fpcexe $(BUILDOPTS)
 
 	touch build-arch-stamp
 
@@ -98,25 +95,55 @@ install-arch-stamp: build-arch-stamp debian-files-stamp
 	dh_clean -k
 
 # Specify the compiler to use so installing will use the correct versioned dir
-	$(MAKE) compiler_install $(INSTALLOPTS)
-	$(MAKE) rtl_install $(INSTALLOPTS)
-	$(MAKE) fcl_install $(INSTALLOPTS)
-	$(MAKE) api_install $(INSTALLOPTS)
-	$(MAKE) utils_install $(INSTALLOPTS)
-	$(MAKE) packages_install $(INSTALLOPTS)
-
-	$(MAKE) fcl_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-fcl
-	$(MAKE) api_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-api
-	$(MAKE) -C packages pkggtk_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-gtk
-	$(MAKE) -C packages pkggfx_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-gfx
-	$(MAKE) -C packages pkgmisc_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-misc
-	$(MAKE) -C packages pkgbase_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-base
-	$(MAKE) -C packages pkgnet_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-net
-	$(MAKE) -C packages pkgdb_exampleinstall $(INSTALLOPTS) DOCINSTALLDIR=$(DOC_DIR)/fp-units-db
-
-	$(MAKE) man_install $(INSTALLOPTS) PREFIXINSTALLDIR=$(INSTALL_DIR)/usr/share
-	$(MAKE) demo_install $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-compiler
-	$(MAKE) doc_install $(INSTALLOPTS) DOCINSTALLDIR=$(INSTALL_DIR)/usr/share/doc/fp-compiler
+	$(MAKE) compiler_distinstall $(INSTALLOPTS)
+	$(MAKE) rtl_distinstall $(INSTALLOPTS)
+	$(MAKE) packages_distinstall $(INSTALLOPTS)
+	$(MAKE) fcl_distinstall $(INSTALLOPTS)
+	$(MAKE) utils_distinstall $(INSTALLOPTS)
+
+# Copy examples to the correct doc dir
+	install -d -m755 $(DOC_DIR)/fp-units-fcl/examples
+	install -d -m755 $(DOC_DIR)/fp-units-gtk/examples
+	install -d -m755 $(DOC_DIR)/fp-units-gfx/examples
+	install -d -m755 $(DOC_DIR)/fp-units-db/examples
+	install -d -m755 $(DOC_DIR)/fp-units-net/examples
+	install -d -m755 $(DOC_DIR)/fp-units-misc/examples
+	install -d -m755 $(DOC_DIR)/fp-units-base/examples
+
+	mv -f $(EXAMPLE_TEMP)/fcl $(DOC_DIR)/fp-units-fcl/examples
+
+	mv -f $(EXAMPLE_TEMP)/gtk $(DOC_DIR)/fp-units-gtk/examples
+
+	mv -f $(EXAMPLE_TEMP)/paszlib $(DOC_DIR)/fp-units-base/examples
+	mv -f $(EXAMPLE_TEMP)/regexpr $(DOC_DIR)/fp-units-base/examples
+	mv -f $(EXAMPLE_TEMP)/ncurses $(DOC_DIR)/fp-units-base/examples
+
+	mv -f $(EXAMPLE_TEMP)/forms $(DOC_DIR)/fp-units-gfx/examples
+	mv -f $(EXAMPLE_TEMP)/ggi $(DOC_DIR)/fp-units-gfx/examples
+	mv -f $(EXAMPLE_TEMP)/libgd $(DOC_DIR)/fp-units-gfx/examples
+	mv -f $(EXAMPLE_TEMP)/svgalib $(DOC_DIR)/fp-units-gfx/examples
+	mv -f $(EXAMPLE_TEMP)/opengl $(DOC_DIR)/fp-units-gfx/examples
+
+	mv -f $(EXAMPLE_TEMP)/ibase $(DOC_DIR)/fp-units-db/examples
+	mv -f $(EXAMPLE_TEMP)/mysql $(DOC_DIR)/fp-units-db/examples
+	mv -f $(EXAMPLE_TEMP)/oracle $(DOC_DIR)/fp-units-db/examples
+	mv -f $(EXAMPLE_TEMP)/postgres $(DOC_DIR)/fp-units-db/examples
+	
+	mv -f $(EXAMPLE_TEMP)/cmem $(DOC_DIR)/fp-units-misc/examples
+	mv -f $(EXAMPLE_TEMP)/gdbint $(DOC_DIR)/fp-units-misc/examples
+	mv -f $(EXAMPLE_TEMP)/utmp $(DOC_DIR)/fp-units-misc/examples
+	mv -f $(EXAMPLE_TEMP)/syslog $(DOC_DIR)/fp-units-misc/examples
+
+	mv -f $(EXAMPLE_TEMP)/inet $(DOC_DIR)/fp-units-net/examples
+	mv -f $(EXAMPLE_TEMP)/uncgi $(DOC_DIR)/fp-units-net/examples
+
+# Check if all examples are removed, if not then the rmdir will fail
+	rmdir $(EXAMPLE_TEMP)
+
+# Install man pages and RTL demos and whatsnew and readme
+	$(MAKE) man_install $(INSTALLOPTS) INSTALL_PREFIX=$(INSTALL_DIR)/usr/share
+	$(MAKE) demo_install $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler
+	$(MAKE) doc_install $(INSTALLOPTS) INSTALL_DOCDIR=$(DOC_DIR)/fp-compiler
 
 # Create ppc386.cfg which is included as conffile
 	chmod 755 compiler/utils/samplecfg 
@@ -204,9 +231,8 @@ binary-arch: build-arch arrange-arch debian-files
 
 	dh_installchangelogs -pfp-compiler logs/Changes.compiler
 	dh_installchangelogs -pfp-units-rtl logs/Changes.rtl
-	dh_installchangelogs -pfp-utils logs/Changes.utils
 	dh_installchangelogs -pfp-units-fcl logs/Changes.fcl
-	dh_installchangelogs -pfp-units-api logs/Changes.api
+	dh_installchangelogs -pfp-utils logs/Changes.utils
 
 	dh_undocumented -a
 	dh_installexamples -a