* regenerated

2025-09-06 09:50:18 +02:00 · 2000-12-19 21:17:35 +00:00 · 2000-12-19 21:17:35 +00:00 · cd494453ca
commit cd494453ca
parent 1103739912
79 changed files with 582 additions and 216 deletions
--- a/api/Makefile
+++ b/api/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/11/08]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -103,7 +105,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif

-export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION

 #####################################################################
 # FPCDIR Setting
@ -559,6 +561,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/api/freebsd/Makefile
+++ b/api/freebsd/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/11/08]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -109,7 +111,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif

-export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION

 #####################################################################
 # Pre Settings
@ -1078,6 +1080,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/api/go32v2/Makefile
+++ b/api/go32v2/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1075,6 +1077,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/api/linux/Makefile
+++ b/api/linux/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1079,6 +1081,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/api/os2/Makefile
+++ b/api/os2/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1075,6 +1077,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/api/test/Makefile
+++ b/api/test/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1083,6 +1085,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/api/win32/Makefile
+++ b/api/win32/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1075,6 +1077,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/compiler/Makefile
+++ b/compiler/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1179,6 +1181,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/compiler/new/Makefile
+++ b/compiler/new/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1173,6 +1175,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/Makefile
+++ b/fcl/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -559,6 +561,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/db/Makefile
+++ b/fcl/db/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1109,6 +1111,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/db/interbase/Makefile
+++ b/fcl/db/interbase/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -637,14 +639,6 @@ DESTZIPDIR:=$(BASEDIR)
 endif
 export DESTZIPDIR

-# On linux, try to find where libgcc.a is.
-ifdef inUnix
-ifndef GCCLIBDIR
-GCCLIBDIR:=$(shell dirname `(gcc -v 2>&1)| head -n 1| awk '{ print $$4 } '`)
-endif
-endif
-export GCCLIBDIR
-
 #####################################################################
 # Install Directories
 #####################################################################
@ -819,16 +813,7 @@ ifdef UNITSDIR
 override FPCOPT+=-Fu$(UNITSDIR)
 endif

-<<<<<<< Makefile
-# Add GCC lib path if asked
-ifdef GCCLIBDIR
-override FPCOPT+=-Fl$(GCCLIBDIR)
-endif
-
 # Target dirs and the prefix to use for clean/install
-=======
-# Target dirs and the prefix to use for clean/install
->>>>>>> 1.1.2.8
 ifdef TARGETDIR
 override FPCOPT+=-FE$(TARGETDIR)
 ifeq ($(TARGETDIR),.)
@ -951,39 +936,18 @@ fpc_units: $(UNITPPUFILES)

 .PHONY: fpc_examples fpc_test

-<<<<<<< Makefile
-ifdef EXEOBJECTS
-override EXEFILES=$(addsuffix $(EXEEXT),$(EXEOBJECTS))
-override EXEOFILES:=$(addsuffix $(OEXT),$(EXEOBJECTS)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(EXEOBJECTS)))
-
-override ALLTARGET+=fpc_exes
-override INSTALLEXEFILES+=$(EXEFILES)
-override CLEANEXEFILES+=$(EXEFILES) $(EXEOFILES)
-=======
 ifdef EXAMPLEOBJECTS
 override EXAMPLESOURCEFILES:=$(addsuffix $(PASEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(EXAMPLEOBJECTS))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(EXAMPLEOBJECTS)) $(addprefix $(LIBPREFIX),$(addsuffix $(STATICLIBEXT),$(EXAMPLEOBJECTS)))
->>>>>>> 1.1.2.8

-<<<<<<< Makefile
-=======
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
->>>>>>> 1.1.2.8
 endif
-<<<<<<< Makefile
-=======

 fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(EXAMPLEDIROBJECTS))
->>>>>>> 1.1.2.8

-<<<<<<< Makefile
-fpc_exes: $(EXEFILES)
-
-=======
 fpc_test: examples

->>>>>>> 1.1.2.8
 #####################################################################
 # General compile rules
 #####################################################################
@ -1176,6 +1140,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/db/tests/Makefile
+++ b/fcl/db/tests/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1129,6 +1131,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/freebsd/Makefile
+++ b/fcl/freebsd/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/11/08]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -109,7 +111,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif

-export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION

 #####################################################################
 # Pre Settings
@ -1156,6 +1158,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/go32v2/Makefile
+++ b/fcl/go32v2/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1124,6 +1126,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/linux/Makefile
+++ b/fcl/linux/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1158,6 +1160,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/os2/Makefile
+++ b/fcl/os2/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/12/15]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -1125,6 +1126,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/shedit/Makefile
+++ b/fcl/shedit/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1056,6 +1058,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/shedit/gtk/Makefile
+++ b/fcl/shedit/gtk/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1125,6 +1127,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/tests/Makefile
+++ b/fcl/tests/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1175,6 +1177,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/win32/Makefile
+++ b/fcl/win32/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1124,6 +1126,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/fcl/xml/Makefile
+++ b/fcl/xml/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1056,6 +1058,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/ide/Makefile
+++ b/ide/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -511,6 +513,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/ide/fake/Makefile
+++ b/ide/fake/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
--- a/ide/fake/compiler/Makefile
+++ b/ide/fake/compiler/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1036,6 +1038,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/ide/fake/gdb/Makefile
+++ b/ide/fake/gdb/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1036,6 +1038,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/ide/text/Makefile
+++ b/ide/text/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/25]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -105,6 +107,21 @@ endif

 export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION

+#####################################################################
+# Pre Settings
+#####################################################################
+
+ifeq ($(OS_TARGET),linux)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+override FPCOPT+=-dUNIX
+endif
+endif
+
+ifeq ($(OS_TARGET),freebsd)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+override FPCOPT+=-dUNIX
+endif
+endif
 #####################################################################
 # FPCDIR Setting
 #####################################################################
@ -1217,6 +1234,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
@ -1250,7 +1270,7 @@ else
 	$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
 ifdef USETAR
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
-	cd $(PACKDIR) ; $(TARPROG) c$(TAROPT) --file $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
+	cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
 else
 	$(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
 	cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
@ -1404,7 +1424,7 @@ endif
 # Users rules
 #####################################################################

-.PHONY: gdb full fullgdb clean_compiler clean
+.PHONY: gdb full fullgdb clean_compiler clean testgdb postgdbinfo

 clean: fpc_cleanall

@ -1425,6 +1445,8 @@ endif
 postgdbinfo:
 ifeq ($(GDBFOUND),0)
 	$(ECHO) LibGDB was not found, IDE has no Debugger support
+else
+	$(ECHO) LibGDB found in $(LIBGDB)
 endif

 gdb:
--- a/install/demo/Makefile
+++ b/install/demo/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -972,6 +974,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/install/demo/graph/Makefile
+++ b/install/demo/graph/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1103,6 +1105,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/install/demo/linux/Makefile
+++ b/install/demo/linux/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1055,6 +1057,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/install/demo/modex/Makefile
+++ b/install/demo/modex/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1055,6 +1057,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/install/demo/text/Makefile
+++ b/install/demo/text/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1053,6 +1055,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/install/demo/win32/Makefile
+++ b/install/demo/win32/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1055,6 +1057,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/install/fpinst/Makefile
+++ b/install/fpinst/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1133,6 +1135,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/Makefile
+++ b/packages/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/12/15]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -161,12 +162,12 @@ endif
 ifeq ($(OS_TARGET),win32)
 override DIROBJECTS+=$(wildcard uncgi gtk gdbint ibase mysql zlib paszlib zip regexpr opengl)
 endif
-ifeq ($(OS_TARGET),freebsd)
-override DIROBJECTS+=$(wildcard zlib ncurses x11 gtk syslog inet uncgi mysql ibase postgres opengl forms svgalib ggi utmp paszlib gdbint cmem regexpr zip)
-endif
 ifeq ($(OS_TARGET),os2)
 override DIROBJECTS+=$(wildcard uncgi paszlib zip regexpr)
 endif
+ifeq ($(OS_TARGET),freebsd)
+override DIROBJECTS+=$(wildcard zlib ncurses x11 gtk syslog inet uncgi mysql ibase postgres opengl forms svgalib ggi utmp paszlib gdbint cmem regexpr zip)
+endif

 # Clean

@ -345,11 +346,6 @@ PKGBAS=paszlib regexpr
 PKGNET=uncgi
 PKGMIS=gdbint zip
 endif
-ifeq ($(OS_TARGET),os2)
-PKGBAS=paszlib regexpr
-PKGNET=uncgi
-PKGMIS=zip
-endif
 ifeq ($(OS_TARGET),win32)
 PKGBAS=paszlib regexpr
 PKGGTK=gtk
@ -358,6 +354,11 @@ PKGDB=ibase mysql
 PKGGFX=opengl
 PKGMIS=gdbint zip
 endif
+ifeq ($(OS_TARGET),os2)
+PKGBAS=paszlib regexpr
+PKGNET=uncgi
+PKGMIS=zip
+endif
 ifeq ($(OS_TARGET),freebsd)
 PKGBASE=zlib ncurses x11 regexpr
 PKGGTK=gtk
@ -968,6 +969,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
@ -1052,12 +1056,6 @@ OBJECTDIRPASZLIB=1
 OBJECTDIRZIP=1
 OBJECTDIRREGEXPR=1
 endif
-ifeq ($(OS_TARGET),os2)
-OBJECTDIRUNCGI=1
-OBJECTDIRPASZLIB=1
-OBJECTDIRZIP=1
-OBJECTDIRREGEXPR=1
-endif
 ifeq ($(OS_TARGET),win32)
 OBJECTDIRUNCGI=1
 OBJECTDIRGTK=1
@ -1070,6 +1068,12 @@ OBJECTDIRZIP=1
 OBJECTDIRREGEXPR=1
 OBJECTDIROPENGL=1
 endif
+ifeq ($(OS_TARGET),os2)
+OBJECTDIRUNCGI=1
+OBJECTDIRPASZLIB=1
+OBJECTDIRZIP=1
+OBJECTDIRREGEXPR=1
+endif
 ifeq ($(OS_TARGET),freebsd)
 OBJECTDIRZLIB=1
 OBJECTDIRNCURSES=1
--- a/packages/cmem/Makefile
+++ b/packages/cmem/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/forms/Makefile
+++ b/packages/forms/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1119,6 +1121,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/forms/demo/Makefile
+++ b/packages/forms/demo/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1124,6 +1126,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/gdbint/Makefile
+++ b/packages/gdbint/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1095,6 +1097,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/gdbint/libgdb/Makefile
+++ b/packages/gdbint/libgdb/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
--- a/packages/ggi/Makefile
+++ b/packages/ggi/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/gtk/Makefile
+++ b/packages/gtk/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1076,6 +1078,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/gtk/examples/Makefile
+++ b/packages/gtk/examples/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1115,6 +1117,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/gtk/examples/tutorial/Makefile
+++ b/packages/gtk/examples/tutorial/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1111,6 +1113,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/ibase/Makefile
+++ b/packages/ibase/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/inet/Makefile
+++ b/packages/inet/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/mysql/Makefile
+++ b/packages/mysql/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/ncurses/Makefile
+++ b/packages/ncurses/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/opengl/Makefile
+++ b/packages/opengl/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -985,6 +987,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/opengl/build/Makefile
+++ b/packages/opengl/build/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all_units

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1095,6 +1097,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/opengl/examples/Makefile
+++ b/packages/opengl/examples/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1143,6 +1145,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/opengl/gtkgl/Makefile
+++ b/packages/opengl/gtkgl/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1178,6 +1180,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/opengl/linux/Makefile
+++ b/packages/opengl/linux/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1082,6 +1084,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/opengl/win32/Makefile
+++ b/packages/opengl/win32/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1082,6 +1084,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/oracle/Makefile
+++ b/packages/oracle/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/11/01]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1101,6 +1103,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/paszlib/Makefile
+++ b/packages/paszlib/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1071,6 +1073,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/postgres/Makefile
+++ b/packages/postgres/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/regexpr/Makefile
+++ b/packages/regexpr/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1075,6 +1077,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/svgalib/Makefile
+++ b/packages/svgalib/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/syslog/Makefile
+++ b/packages/syslog/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/uncgi/Makefile
+++ b/packages/uncgi/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1068,6 +1070,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/utmp/Makefile
+++ b/packages/utmp/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1070,6 +1072,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/x11/Makefile
+++ b/packages/x11/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1046,6 +1048,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/zip/Makefile
+++ b/packages/zip/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1049,6 +1051,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/packages/zlib/Makefile
+++ b/packages/zlib/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1046,6 +1048,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/rtl/Makefile
+++ b/rtl/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -513,6 +515,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/rtl/freebsd/Makefile
+++ b/rtl/freebsd/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/11/08]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -110,7 +112,7 @@ ifndef FPC_VERSION
 FPC_VERSION:=$(shell $(FPC) -iV)
 endif

-export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
+export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION

 #####################################################################
 # Pre Settings
@ -1087,6 +1089,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/rtl/go32v1/Makefile
+++ b/rtl/go32v1/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1060,6 +1062,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/rtl/go32v2/Makefile
+++ b/rtl/go32v2/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1076,6 +1078,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/rtl/linux/Makefile
+++ b/rtl/linux/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1089,6 +1091,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/rtl/os2/Makefile
+++ b/rtl/os2/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1072,6 +1074,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/rtl/win32/Makefile
+++ b/rtl/win32/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1082,6 +1084,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/tests/Makefile
+++ b/tests/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: alltests

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -944,6 +946,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/tests/units/Makefile
+++ b/tests/units/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1034,6 +1036,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/utils/Makefile
+++ b/utils/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1181,6 +1183,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/utils/fprcp/Makefile
+++ b/utils/fprcp/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1051,6 +1053,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/utils/h2pas/Makefile
+++ b/utils/h2pas/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1056,6 +1058,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/utils/simulator/Makefile
+++ b/utils/simulator/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1051,6 +1053,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file
--- a/utils/tply/Makefile
+++ b/utils/tply/Makefile
@ -1,13 +1,14 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/10/27]
+# Makefile generated by fpcmake v1.00 [2000/12/19]
 #

 defaultrule: all

 #####################################################################
-# Autodetect OS (Linux or Dos or Windows NT)
+# Autodetect OS (Linux or Dos or Windows NT or OS/2)
 # define inUnix when running under Unix (Linux,FreeBSD)
 # define inWinNT when running under WinNT
+# define inOS2 when running under OS/2
 #####################################################################

 # We need only / in the path
@ -24,6 +25,7 @@ nopwd:
 	@exit
 else
 inUnix=1
+PWD:=$(firstword $(PWD))
 endif
 else
 PWD:=$(firstword $(PWD))
@ -1069,6 +1071,9 @@ endif
 ifeq ($(OS_TARGET),win32)
 PACKAGESUFFIX=w32
 endif
+ifeq ($(OS_TARGET),os2)
+PACKAGESUFFIX=emx
+endif
 endif

 # Temporary path to pack a file