diff --git a/install/fpinst/install.dos b/install/fpinst/install.dos
index 709daebd6b..a2caf731b3 100644
--- a/install/fpinst/install.dos
+++ b/install/fpinst/install.dos
@@ -1,10 +1,10 @@
 #
 # $Id$
 #
-# Go32 Install file
+# Go32v2 Install file
 #
 title=Free Pascal Compiler for Go32v2
-version=0.99.10
+version=0.99.12
 
 basepath=c:\pp
 binsub=\bin\go32v2
@@ -13,17 +13,17 @@ ppc386=ppc386
 package=basego32.zip,~B~asic system for Go32v2 (required)
 package=asldgo32.zip,GNU ~L~inker and GNU Assembler for Go32v2 (required)
 package=gdbgo32.zip,GNU ~D~ebugger for Go32v2
-package=utilgo32.zip,GNU ~U~tilities (required to recompile run time library)
+package=utilgo32.zip,GNU ~U~tilities (for makefiles)
 package=demo.zip,D~e~mos
-package=docs-htm.zip,Documentation (~H~TML)
-package=rl09910s.zip,~R~un time library sources
-package=pp09910s.zip,~C~ompiler sources
-package=doc110s.zip,Documentation sources (La~T~eX)
+package=doc-html.zip,Documentation (~H~TML)
+package=rl09912s.zip,~R~un time library sources
+package=pp09912s.zip,~C~ompiler sources
+package=doc160s.zip,Documentation sources (La~T~eX)
 
 cfgfile=ppc386.cfg
 defaultcfg=
 #
-# Example ppc386.cfg for Free Pascal Compiler Version 0.99.10
+# Example ppc386.cfg for Free Pascal Compiler Version 0.99.12
 #
 
 # ----------------------
@@ -72,6 +72,9 @@ defaultcfg=
 # All assembler blocks are AT&T styled by default
 #-Ratt
 
+# All assembler blocks are directly copied to asm
+#-Rdirect
+
 # Semantic checking
 # -S2   switch some Delphi 2 extension on
 # -Sc   supports operators like C (*=,+=,/= and -=)
@@ -117,47 +120,84 @@ defaultcfg=
 #     -Op3  set target processor to PPro/PII/c6x86/K6 (tm)
 
 # Optimize always for Size and Pentium
-#-OG2p2
+#-Og2p2
 
 
 # -----------------------
 # Set Filenames and Paths
 # -----------------------
 
-# Slashes are also allowed under dos
+# Both slashes and backslashes are allowed in paths
 
 # path to the messagefile, not necessary anymore but can be used to override
 # the default language
-#-Fr$1/bin/errore.msg
-#-Fr$1/bin/errorn.msg
+#-Fr$1/msg/errore.msg
+#-Fr$1/msg/errorn.msg
+#-Fr$1/msg/errores.msg
+#-Fr$1/msg/errord.msg
+#-Fr$1/msg/errorr.msg
 
 # path to the gcclib
-#-Fg$1/lib
+#-Fl$1/lib
 
 # searchpath for includefiles
-#-Fi$1/inc;$1/rtl/inc
+#-Fi$1/inc;$1/rtl/inc;$1/i386;$1/rtl/i386
 
-# searchpath for units (does the same as -Up)
+# searchpath for objectfiles
+#-Fo$1/inc;$1/rtl/inc;$1/i386;$1/rtl/i386
+
+# searchpath for units and other system dependent things
 #IFDEF Go32V1
+  -FD$1/bin/go32v1
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/go32v1/static
-  #ELSE
-    -Fu$1/rtl/go32v1
+    -Fu$1/units/go32v1/static
   #ENDIF
+  -Fu$1/rtl/go32v1
+  -Fu$1/units/go32v1
 #ENDIF
 #IFDEF Go32V2
+  -FD$1/bin/go32v2
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/go32v2/static
-  #ELSE
-    -Fu$1/rtl/go32v2
+    -Fu$1/units/go32v2/static
   #ENDIF
+  -Fu$1/rtl/go32v2
+  -Fu$1/units/go32v2
 #ENDIF
 #IFDEF Win32
+  -FD$1/bin/win32
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/win32/static
-  #ELSE
-    -Fu$1/rtl/win32
+    -Fu$1/units/win32/static
   #ENDIF
+  -Fu$1/rtl/win32
+  -Fu$1/units/win32
+#ENDIF
+#IFDEF OS2
+  -FD$1/bin/os2
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/os2/static
+    -Fu$1/units/os2/static
+  #ENDIF
+  -Fu$1/rtl/os2
+  -Fu$1/units/os2
+#ENDIF
+#IFDEF Linux
+  # For statically, smartlinked units
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/static
+    -Fu$1/units/static
+  #ENDIF
+  # For Dynamically linked units
+  #IFDEF FPC_LINK_DYNAMIC
+    -Fu$1/rtl/shared
+    -Fu$1/units/shared
+  #ENDIF
+  -Fu$1/rtl
+  -Fu$1/units
+  #-Fu~/pp/units;~/pp/rtl/linux
+  #-Fu/usr/lib/fpc/0.99.12/units;/usr/lib/fpc/0.99.12/rtl
 #ENDIF
 
 # searchpath for libraries
@@ -177,7 +217,7 @@ defaultcfg=
 #-k-s
 
 # Always strip debuginfo from the executable
-#-Xs
+-Xs
 
 
 # -------------
diff --git a/install/fpinst/install.lin b/install/fpinst/install.lin
index 88d4265020..e26f8adf44 100644
--- a/install/fpinst/install.lin
+++ b/install/fpinst/install.lin
@@ -4,26 +4,26 @@
 # Linux Install file
 #
 title=Free Pascal Compiler for Linux
-version=0.99.10
+version=0.99.12
 
-basepath=/usr/lib/fpc/0.99.10
+basepath=/usr/lib/fpc/0.99.12
 binsub=
 ppc386=ppc386
 
-package=basego32.zip,~B~asic system for Linux (required)
-#package=asldgo32.zip,GNU ~L~inker and GNU Assembler for Go32v2 (required)
-#package=gdbgo32.zip,GNU ~D~ebugger for Go32v2
-#package=utilgo32.zip,GNU ~U~tilities (required to recompile run time library)
+package=baselin.zip,~B~asic system for Linux (required)
+#package=asldlin.zip,GNU ~L~inker and GNU Assembler for Go32v2 (required)
+#package=gdblin.zip,GNU ~D~ebugger for Go32v2
+#package=utillin.zip,GNU ~U~tilities (required to recompile run time library)
 package=demo.zip,D~e~mos
-package=docs-htm.zip,Documentation (~H~TML)
-package=rl09910s.zip,~R~un time library sources
-package=pp09910s.zip,~C~ompiler sources
-package=doc110s.zip,Documentation sources (La~T~eX)
+package=doc-html.zip,Documentation (~H~TML)
+package=rl09912s.zip,~R~un time library sources
+package=pp09912s.zip,~C~ompiler sources
+package=doc160s.zip,Documentation sources (La~T~eX)
 
 cfgfile=ppc386.cfg
 defaultcfg=
 #
-# Example ppc386.cfg for Free Pascal Compiler Version 0.99.10
+# Example ppc386.cfg for Free Pascal Compiler Version 0.99.12
 #
 
 # ----------------------
@@ -72,6 +72,9 @@ defaultcfg=
 # All assembler blocks are AT&T styled by default
 #-Ratt
 
+# All assembler blocks are directly copied to asm
+#-Rdirect
+
 # Semantic checking
 # -S2   switch some Delphi 2 extension on
 # -Sc   supports operators like C (*=,+=,/= and -=)
@@ -117,47 +120,91 @@ defaultcfg=
 #     -Op3  set target processor to PPro/PII/c6x86/K6 (tm)
 
 # Optimize always for Size and Pentium
-#-OG2p2
+#-Og2p2
 
 
 # -----------------------
 # Set Filenames and Paths
 # -----------------------
 
-# Slashes are also allowed under dos
+# Both slashes and backslashes are allowed in paths
 
 # path to the messagefile, not necessary anymore but can be used to override
 # the default language
 #-Fr$1/msg/errore.msg
 #-Fr$1/msg/errorn.msg
+#-Fr$1/msg/errores.msg
+#-Fr$1/msg/errord.msg
+#-Fr$1/msg/errorr.msg
 
 # path to the gcclib
-#-Fg/usr/lib/gcc-lib/i486-linux/2.7.2.3/
+#-Fl$1/lib
 
 # searchpath for includefiles
-#-Fi~/pp/inc;~/pp/rtl/inc
+#-Fi$1/inc;$1/rtl/inc;$1/i386;$1/rtl/i386
 
-# searchpath for units (does the same as -Up)
-# For statically, smartlinked units
-#IFDEF FPC_LINK_STATIC
--Fu\$1/rtl/static
--Fu\$1/units/static
+# searchpath for objectfiles
+#-Fo$1/inc;$1/rtl/inc;$1/i386;$1/rtl/i386
+
+# searchpath for units and other system dependent things
+#IFDEF Go32V1
+  -FD$1/bin/go32v1
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/go32v1/static
+    -Fu$1/units/go32v1/static
+  #ENDIF
+  -Fu$1/rtl/go32v1
+  -Fu$1/units/go32v1
 #ENDIF
-# For Dynamically linked units
-#IFDEF FPC_LINK_DYNAMIC
--Fu\$1/rtl/shared
--Fu\$1/units/shared
+#IFDEF Go32V2
+  -FD$1/bin/go32v2
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/go32v2/static
+    -Fu$1/units/go32v2/static
+  #ENDIF
+  -Fu$1/rtl/go32v2
+  -Fu$1/units/go32v2
+#ENDIF
+#IFDEF Win32
+  -FD$1/bin/win32
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/win32/static
+    -Fu$1/units/win32/static
+  #ENDIF
+  -Fu$1/rtl/win32
+  -Fu$1/units/win32
+#ENDIF
+#IFDEF OS2
+  -FD$1/bin/os2
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/os2/static
+    -Fu$1/units/os2/static
+  #ENDIF
+  -Fu$1/rtl/os2
+  -Fu$1/units/os2
+#ENDIF
+#IFDEF Linux
+  # For statically, smartlinked units
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/static
+    -Fu$1/units/static
+  #ENDIF
+  # For Dynamically linked units
+  #IFDEF FPC_LINK_DYNAMIC
+    -Fu$1/rtl/shared
+    -Fu$1/units/shared
+  #ENDIF
+  -Fu$1/rtl
+  -Fu$1/units
+  #-Fu~/pp/units;~/pp/rtl/linux
+  #-Fu/usr/lib/fpc/0.99.12/units;/usr/lib/fpc/0.99.12/rtl
 #ENDIF
-# For normal units
--Fu\$1/rtl
--Fu\$1/units
-#-Fu~/pp/units;~/pp/rtl/linux
-#-Fu/usr/lib/ppc/units;/usr/lib/ppc/linuxunits
 
 # searchpath for libraries
-#-Fl/pp/lib
+#-Fl$1/lib
 #-Fl/lib;/usr/lib
 
+
 # -------------
 # Linking
 # -------------
diff --git a/install/fpinst/install.os2 b/install/fpinst/install.os2
index eb848117b7..93b2941619 100644
--- a/install/fpinst/install.os2
+++ b/install/fpinst/install.os2
@@ -14,8 +14,8 @@ package=baseemx.zip,~B~asic system for EMX (required)
 package=asldemx.zip,GNU ~L~inker and assembler for EMX (required)
 package=gdbemx.zip,GNU ~D~ebugger for EMX and PMGDB front-end
 package=utilemx.zip,GNU ~U~tilities (for makefiles)
-package=demo.zip,D~e~mos
-package=docs-htm.zip,Documentation (~H~TML)
+package=demos.zip,D~e~mos
+package=doc-html.zip,Documentation (~H~TML)
 package=rl09912s.zip,~R~un time library sources
 package=pp09912s.zip,~C~ompiler sources
 package=doc160s.zip,Documentation sources (La~T~eX)
@@ -127,80 +127,77 @@ defaultcfg=
 # Set Filenames and Paths
 # -----------------------
 
-# Both slashes and backslashes are allowed under DOS and OS/2
+# Both slashes and backslashes are allowed in paths
 
 # path to the messagefile, not necessary anymore but can be used to override
 # the default language
 #-Fr$1/msg/errore.msg
 #-Fr$1/msg/errorn.msg
+#-Fr$1/msg/errores.msg
+#-Fr$1/msg/errord.msg
+#-Fr$1/msg/errorr.msg
 
 # path to the gcclib
-#-Fg$1/lib
+#-Fl$1/lib
 
 # searchpath for includefiles
--Fi$1/inc;$1/rtl/inc;$1/rtl/i386
+#-Fi$1/inc;$1/rtl/inc;$1/i386;$1/rtl/i386
 
-# searchpath for units (does the same as -Up) and other system dependent things
+# searchpath for objectfiles
+#-Fo$1/inc;$1/rtl/inc;$1/i386;$1/rtl/i386
+
+# searchpath for units and other system dependent things
 #IFDEF Go32V1
-  -Fi$1/rtl/go32v1
   -FD$1/bin/go32v1
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/go32v1/static
     -Fu$1/units/go32v1/static
-  #ELSE
-    -Fu$1/rtl/go32v1
-    -Fu$1/units/go32v1
   #ENDIF
+  -Fu$1/rtl/go32v1
+  -Fu$1/units/go32v1
 #ENDIF
 #IFDEF Go32V2
-  -Fi$1/rtl/go32v2
   -FD$1/bin/go32v2
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/go32v2/static
     -Fu$1/units/go32v2/static
-  #ELSE
-    -Fu$1/rtl/go32v2
-    -Fu$1/units/go32v2
   #ENDIF
+  -Fu$1/rtl/go32v2
+  -Fu$1/units/go32v2
 #ENDIF
 #IFDEF Win32
-  -Fi$1/rtl/win32
   -FD$1/bin/win32
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/win32/static
     -Fu$1/units/win32/static
-  #ELSE
-    -Fu$1/rtl/win32
-    -Fu$1/units/win32
   #ENDIF
+  -Fu$1/rtl/win32
+  -Fu$1/units/win32
 #ENDIF
 #IFDEF OS2
-  -Fi$1/rtl/os2
   -FD$1/bin/os2
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/os2/static
     -Fu$1/units/os2/static
-  #ELSE
-    -Fu$1/rtl/os2
-    -Fu$1/units/os2
   #ENDIF
+  -Fu$1/rtl/os2
+  -Fu$1/units/os2
 #ENDIF
 #IFDEF Linux
   # For statically, smartlinked units
   #IFDEF FPC_LINK_STATIC
-    -Fu$1/rtl/linux/static
-    -Fu$1/units/linux/static
+    -Fu$1/rtl/static
+    -Fu$1/units/static
   #ENDIF
   # For Dynamically linked units
   #IFDEF FPC_LINK_DYNAMIC
-    -Fu$1/rtl/linux/shared
-    -Fu$1/units/linux/shared
+    -Fu$1/rtl/shared
+    -Fu$1/units/shared
   #ENDIF
-# For normal units
--Fu$1/rtl/linux
--Fu$1/units/linux
-#-Fu~/pp/units;~/pp/rtl/linux
-#-Fu/usr/lib/ppc/units;/usr/lib/ppc/linuxunits
+  -Fu$1/rtl
+  -Fu$1/units
+  #-Fu~/pp/units;~/pp/rtl/linux
+  #-Fu/usr/lib/fpc/0.99.12/units;/usr/lib/fpc/0.99.12/rtl
 #ENDIF
 
 # searchpath for libraries
diff --git a/install/fpinst/install.pas b/install/fpinst/install.pas
index a81db31615..a1e236e420 100644
--- a/install/fpinst/install.pas
+++ b/install/fpinst/install.pas
@@ -16,8 +16,8 @@
  **********************************************************************}
 program install;
 
-{$DEFINE FV}       (* TH - added to make use of the original Turbo Vision possible. *)
-{$DEFINE DLL}      (* TH - if defined, UNZIP32.DLL library is used to unpack. *)
+{$DEFINE FV}         (* TH - added to make use of the original Turbo Vision possible. *)
+{ $DEFINE DLL}       (* TH - if defined, UNZIP32.DLL library is used to unpack. *)
 { $DEFINE DOSSTUB}   (* TH - should _not_ be defined unless creating a bound DOS and OS/2 installer!!! *)
 (* Defining DOSSTUB causes adding a small piece of code    *)
 (* for starting the OS/2 part from the DOS part of a bound *)
@@ -930,7 +930,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.2  1999-06-10 07:28:27  hajny
+  Revision 1.3  1999-06-10 15:00:14  peter
+    * fixed to compile for not os2
+    * update install.dat
+
+  Revision 1.2  1999/06/10 07:28:27  hajny
     * compilable with TP again
 
   Revision 1.1  1999/02/19 16:45:26  peter
diff --git a/install/fpinst/install.w32 b/install/fpinst/install.w32
index 1824d6ae51..7af4b84c00 100644
--- a/install/fpinst/install.w32
+++ b/install/fpinst/install.w32
@@ -4,7 +4,7 @@
 # Win32 Install file
 #
 title=Free Pascal Compiler for Win32
-version=0.99.10
+version=0.99.12
 
 basepath=c:\pp
 binsub=\bin\win32
@@ -13,17 +13,17 @@ ppc386=ppc386
 package=basew32.zip,~B~asic system for Win32 (required)
 package=asldw32.zip,GNU ~L~inker and GNU Assembler for Win32 (required)
 package=gdbw32.zip,GNU ~D~ebugger for Win32
-package=utilw32.zip,GNU ~U~tilities (required to recompile run time library)
+package=utilw32.zip,GNU ~U~tilities (for makefiles)
 package=demo.zip,D~e~mos
-package=docs-htm.zip,Documentation (~H~TML)
-package=rl09910s.zip,~R~un time library sources
-package=pp09910s.zip,~C~ompiler sources
-package=doc110s.zip,Documentation sources (La~T~eX)
+package=doc-html.zip,Documentation (~H~TML)
+package=rl09912s.zip,~R~un time library sources
+package=pp09912s.zip,~C~ompiler sources
+package=doc160s.zip,Documentation sources (La~T~eX)
 
 cfgfile=ppc386.cfg
 defaultcfg=
 #
-# Example ppc386.cfg for Free Pascal Compiler Version 0.99.10
+# Example ppc386.cfg for Free Pascal Compiler Version 0.99.12
 #
 
 # ----------------------
@@ -72,6 +72,9 @@ defaultcfg=
 # All assembler blocks are AT&T styled by default
 #-Ratt
 
+# All assembler blocks are directly copied to asm
+#-Rdirect
+
 # Semantic checking
 # -S2   switch some Delphi 2 extension on
 # -Sc   supports operators like C (*=,+=,/= and -=)
@@ -117,47 +120,84 @@ defaultcfg=
 #     -Op3  set target processor to PPro/PII/c6x86/K6 (tm)
 
 # Optimize always for Size and Pentium
-#-OG2p2
+#-Og2p2
 
 
 # -----------------------
 # Set Filenames and Paths
 # -----------------------
 
-# Slashes are also allowed under dos
+# Both slashes and backslashes are allowed in paths
 
 # path to the messagefile, not necessary anymore but can be used to override
 # the default language
-#-Fr$1/bin/errore.msg
-#-Fr$1/bin/errorn.msg
+#-Fr$1/msg/errore.msg
+#-Fr$1/msg/errorn.msg
+#-Fr$1/msg/errores.msg
+#-Fr$1/msg/errord.msg
+#-Fr$1/msg/errorr.msg
 
 # path to the gcclib
-#-Fg$1/lib
+#-Fl$1/lib
 
 # searchpath for includefiles
-#-Fi$1/inc;$1/rtl/inc
+#-Fi$1/inc;$1/rtl/inc;$1/i386;$1/rtl/i386
 
-# searchpath for units (does the same as -Up)
+# searchpath for objectfiles
+#-Fo$1/inc;$1/rtl/inc;$1/i386;$1/rtl/i386
+
+# searchpath for units and other system dependent things
 #IFDEF Go32V1
+  -FD$1/bin/go32v1
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/go32v1/static
-  #ELSE
-    -Fu$1/rtl/go32v1
+    -Fu$1/units/go32v1/static
   #ENDIF
+  -Fu$1/rtl/go32v1
+  -Fu$1/units/go32v1
 #ENDIF
 #IFDEF Go32V2
+  -FD$1/bin/go32v2
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/go32v2/static
-  #ELSE
-    -Fu$1/rtl/go32v2
+    -Fu$1/units/go32v2/static
   #ENDIF
+  -Fu$1/rtl/go32v2
+  -Fu$1/units/go32v2
 #ENDIF
 #IFDEF Win32
+  -FD$1/bin/win32
   #IFDEF FPC_LINK_STATIC
     -Fu$1/rtl/win32/static
-  #ELSE
-    -Fu$1/rtl/win32
+    -Fu$1/units/win32/static
   #ENDIF
+  -Fu$1/rtl/win32
+  -Fu$1/units/win32
+#ENDIF
+#IFDEF OS2
+  -FD$1/bin/os2
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/os2/static
+    -Fu$1/units/os2/static
+  #ENDIF
+  -Fu$1/rtl/os2
+  -Fu$1/units/os2
+#ENDIF
+#IFDEF Linux
+  # For statically, smartlinked units
+  #IFDEF FPC_LINK_STATIC
+    -Fu$1/rtl/static
+    -Fu$1/units/static
+  #ENDIF
+  # For Dynamically linked units
+  #IFDEF FPC_LINK_DYNAMIC
+    -Fu$1/rtl/shared
+    -Fu$1/units/shared
+  #ENDIF
+  -Fu$1/rtl
+  -Fu$1/units
+  #-Fu~/pp/units;~/pp/rtl/linux
+  #-Fu/usr/lib/fpc/0.99.12/units;/usr/lib/fpc/0.99.12/rtl
 #ENDIF
 
 # searchpath for libraries
@@ -205,3 +245,4 @@ defaultcfg=
 # That's all folks
 #
 endcfg
+
diff --git a/install/fpinst/unzip.pas b/install/fpinst/unzip.pas
index 06cefc5fd0..20bf56e1ac 100644
--- a/install/fpinst/unzip.pas
+++ b/install/fpinst/unzip.pas
@@ -3034,9 +3034,9 @@ VAR
 BEGIN
 {$IFDEF FPC}
   IF not assigned(Report) THEN
-   Report := DummyReport;
+   Report := @DummyReport;
   IF not assigned(Question) THEN
-   Question := DummyQuestion;
+   Question := @DummyQuestion;
 {$ELSE}
   IF @Report = nil THEN
    Report := DummyReport;
@@ -3328,7 +3328,11 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.2  1999-06-10 07:28:28  hajny
+  Revision 1.3  1999-06-10 15:00:16  peter
+    * fixed to compile for not os2
+    * update install.dat
+
+  Revision 1.2  1999/06/10 07:28:28  hajny
     * compilable with TP again
 
   Revision 1.1  1999/02/19 16:45:26  peter