From cd494453ca4d50da239c369ca77079f769d9889f Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 19 Dec 2000 21:17:35 +0000 Subject: [PATCH] * regenerated --- api/Makefile | 11 ++++-- api/freebsd/Makefile | 11 ++++-- api/go32v2/Makefile | 9 +++-- api/linux/Makefile | 9 +++-- api/os2/Makefile | 9 +++-- api/test/Makefile | 9 +++-- api/win32/Makefile | 9 +++-- compiler/Makefile | 9 +++-- compiler/new/Makefile | 9 +++-- fcl/Makefile | 9 +++-- fcl/db/Makefile | 9 +++-- fcl/db/interbase/Makefile | 47 ++++--------------------- fcl/db/tests/Makefile | 9 +++-- fcl/freebsd/Makefile | 11 ++++-- fcl/go32v2/Makefile | 9 +++-- fcl/linux/Makefile | 9 +++-- fcl/os2/Makefile | 8 +++-- fcl/shedit/Makefile | 9 +++-- fcl/shedit/gtk/Makefile | 9 +++-- fcl/tests/Makefile | 9 +++-- fcl/win32/Makefile | 9 +++-- fcl/xml/Makefile | 9 +++-- ide/Makefile | 9 +++-- ide/fake/Makefile | 6 ++-- ide/fake/compiler/Makefile | 9 +++-- ide/fake/gdb/Makefile | 9 +++-- ide/text/Makefile | 30 +++++++++++++--- install/demo/Makefile | 9 +++-- install/demo/graph/Makefile | 9 +++-- install/demo/linux/Makefile | 9 +++-- install/demo/modex/Makefile | 9 +++-- install/demo/text/Makefile | 9 +++-- install/demo/win32/Makefile | 9 +++-- install/fpinst/Makefile | 9 +++-- packages/Makefile | 36 ++++++++++--------- packages/cmem/Makefile | 9 +++-- packages/forms/Makefile | 9 +++-- packages/forms/demo/Makefile | 9 +++-- packages/gdbint/Makefile | 9 +++-- packages/gdbint/libgdb/Makefile | 6 ++-- packages/ggi/Makefile | 9 +++-- packages/gtk/Makefile | 9 +++-- packages/gtk/examples/Makefile | 9 +++-- packages/gtk/examples/tutorial/Makefile | 9 +++-- packages/ibase/Makefile | 9 +++-- packages/inet/Makefile | 9 +++-- packages/mysql/Makefile | 9 +++-- packages/ncurses/Makefile | 9 +++-- packages/opengl/Makefile | 9 +++-- packages/opengl/build/Makefile | 9 +++-- packages/opengl/examples/Makefile | 9 +++-- packages/opengl/gtkgl/Makefile | 9 +++-- packages/opengl/linux/Makefile | 9 +++-- packages/opengl/win32/Makefile | 9 +++-- packages/oracle/Makefile | 9 +++-- packages/paszlib/Makefile | 9 +++-- packages/postgres/Makefile | 9 +++-- packages/regexpr/Makefile | 9 +++-- packages/svgalib/Makefile | 9 +++-- packages/syslog/Makefile | 9 +++-- packages/uncgi/Makefile | 9 +++-- packages/utmp/Makefile | 9 +++-- packages/x11/Makefile | 9 +++-- packages/zip/Makefile | 9 +++-- packages/zlib/Makefile | 9 +++-- rtl/Makefile | 9 +++-- rtl/freebsd/Makefile | 11 ++++-- rtl/go32v1/Makefile | 9 +++-- rtl/go32v2/Makefile | 9 +++-- rtl/linux/Makefile | 9 +++-- rtl/os2/Makefile | 9 +++-- rtl/win32/Makefile | 9 +++-- tests/Makefile | 9 +++-- tests/units/Makefile | 9 +++-- utils/Makefile | 9 +++-- utils/fprcp/Makefile | 9 +++-- utils/h2pas/Makefile | 9 +++-- utils/simulator/Makefile | 9 +++-- utils/tply/Makefile | 9 +++-- 79 files changed, 582 insertions(+), 216 deletions(-) diff --git a/api/Makefile b/api/Makefile index 9f92f5d64c..dafe437e92 100644 --- 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 diff --git a/api/freebsd/Makefile b/api/freebsd/Makefile index e549113983..b4b029d43c 100644 --- 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 diff --git a/api/go32v2/Makefile b/api/go32v2/Makefile index 5d15161bcd..954472e132 100644 --- 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 diff --git a/api/linux/Makefile b/api/linux/Makefile index e055a36ae4..276cf43783 100644 --- 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 diff --git a/api/os2/Makefile b/api/os2/Makefile index e0f55eeb22..ac77d927da 100644 --- 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 diff --git a/api/test/Makefile b/api/test/Makefile index 669f743475..3bfcac0c88 100644 --- 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 diff --git a/api/win32/Makefile b/api/win32/Makefile index 2d455e31c2..8f45377d10 100644 --- 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 diff --git a/compiler/Makefile b/compiler/Makefile index 14693fcd11..c5b2e46fc6 100644 --- 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 diff --git a/compiler/new/Makefile b/compiler/new/Makefile index f96f731cff..074f692b73 100644 --- 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 diff --git a/fcl/Makefile b/fcl/Makefile index 097767c3f3..91ab853802 100644 --- 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 diff --git a/fcl/db/Makefile b/fcl/db/Makefile index db16466d08..e098e952fd 100644 --- 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 diff --git a/fcl/db/interbase/Makefile b/fcl/db/interbase/Makefile index 1163698800..688adc1c58 100644 --- 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 diff --git a/fcl/db/tests/Makefile b/fcl/db/tests/Makefile index 9b14c2cf5a..cae157b36c 100644 --- 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 diff --git a/fcl/freebsd/Makefile b/fcl/freebsd/Makefile index b6229a1db4..913d6789e1 100644 --- 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 diff --git a/fcl/go32v2/Makefile b/fcl/go32v2/Makefile index ccaafcd852..4cb119b19c 100644 --- 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 diff --git a/fcl/linux/Makefile b/fcl/linux/Makefile index 3c79590e74..7680f9f025 100644 --- 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 diff --git a/fcl/os2/Makefile b/fcl/os2/Makefile index 21cdacdad1..c020125b02 100644 --- 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 diff --git a/fcl/shedit/Makefile b/fcl/shedit/Makefile index cb74cec2e1..ca18b9d801 100644 --- 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 diff --git a/fcl/shedit/gtk/Makefile b/fcl/shedit/gtk/Makefile index 59d7dba31b..d56c2163b8 100644 --- 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 diff --git a/fcl/tests/Makefile b/fcl/tests/Makefile index b7945d2f7c..0d4755f398 100644 --- 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 diff --git a/fcl/win32/Makefile b/fcl/win32/Makefile index 8c69f78b3f..77b251844d 100644 --- 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 diff --git a/fcl/xml/Makefile b/fcl/xml/Makefile index 5db7d8d40a..9416fcf057 100644 --- 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 diff --git a/ide/Makefile b/ide/Makefile index 056c26ed8d..063f3a6e6c 100644 --- 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 diff --git a/ide/fake/Makefile b/ide/fake/Makefile index 684e29935e..629a89a940 100644 --- 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)) diff --git a/ide/fake/compiler/Makefile b/ide/fake/compiler/Makefile index 39949eb82b..8658d9c166 100644 --- 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 diff --git a/ide/fake/gdb/Makefile b/ide/fake/gdb/Makefile index ceacf4d05a..0093cd1acc 100644 --- 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 diff --git a/ide/text/Makefile b/ide/text/Makefile index 7cc42046e9..02ccf3230e 100644 --- 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: diff --git a/install/demo/Makefile b/install/demo/Makefile index 12aed8fd1f..af8e46d6e4 100644 --- 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 diff --git a/install/demo/graph/Makefile b/install/demo/graph/Makefile index d2a2e56d0e..3b5ea7d040 100644 --- 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 diff --git a/install/demo/linux/Makefile b/install/demo/linux/Makefile index 45b45d05ca..cf992c2a71 100644 --- 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 diff --git a/install/demo/modex/Makefile b/install/demo/modex/Makefile index affe2cba2c..e1c3a70880 100644 --- 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 diff --git a/install/demo/text/Makefile b/install/demo/text/Makefile index 65fcc6f2ed..230cf7e99e 100644 --- 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 diff --git a/install/demo/win32/Makefile b/install/demo/win32/Makefile index 40263d9047..154ec4a807 100644 --- 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 diff --git a/install/fpinst/Makefile b/install/fpinst/Makefile index be32f8e1c9..722205ecae 100644 --- 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 diff --git a/packages/Makefile b/packages/Makefile index 46626eabdd..c3e42a1b5a 100644 --- 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 diff --git a/packages/cmem/Makefile b/packages/cmem/Makefile index 424a06b5ab..5c3ee6553d 100644 --- 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 diff --git a/packages/forms/Makefile b/packages/forms/Makefile index ad68c7b9f5..e1c3b7ba74 100644 --- 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 diff --git a/packages/forms/demo/Makefile b/packages/forms/demo/Makefile index 5f6cad1bed..1899122212 100644 --- 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 diff --git a/packages/gdbint/Makefile b/packages/gdbint/Makefile index 9299f03c67..b4f8b11e4b 100644 --- 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 diff --git a/packages/gdbint/libgdb/Makefile b/packages/gdbint/libgdb/Makefile index 6c78c0b93a..4c47860053 100644 --- 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)) diff --git a/packages/ggi/Makefile b/packages/ggi/Makefile index 7d7f411369..b7dfc19f21 100644 --- 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 diff --git a/packages/gtk/Makefile b/packages/gtk/Makefile index e6ccb2ee1f..da15f780bb 100644 --- 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 diff --git a/packages/gtk/examples/Makefile b/packages/gtk/examples/Makefile index 881f88f5b1..851ebfd5fa 100644 --- 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 diff --git a/packages/gtk/examples/tutorial/Makefile b/packages/gtk/examples/tutorial/Makefile index a7effba38f..d2a50be12b 100644 --- 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 diff --git a/packages/ibase/Makefile b/packages/ibase/Makefile index f6cdd6030b..9c01d5e11f 100644 --- 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 diff --git a/packages/inet/Makefile b/packages/inet/Makefile index 9884568710..86fe12cca5 100644 --- 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 diff --git a/packages/mysql/Makefile b/packages/mysql/Makefile index 564cccf4e4..407b28fc36 100644 --- 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 diff --git a/packages/ncurses/Makefile b/packages/ncurses/Makefile index 9cf57c6306..cf5f28e4c1 100644 --- 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 diff --git a/packages/opengl/Makefile b/packages/opengl/Makefile index bf5abe3ed2..8a451f6b1e 100644 --- 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 diff --git a/packages/opengl/build/Makefile b/packages/opengl/build/Makefile index b71ca2d918..861b156a2f 100644 --- 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 diff --git a/packages/opengl/examples/Makefile b/packages/opengl/examples/Makefile index 6ce8798945..49b083d558 100644 --- 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 diff --git a/packages/opengl/gtkgl/Makefile b/packages/opengl/gtkgl/Makefile index 2ba11c5dc6..8730313fb9 100644 --- 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 diff --git a/packages/opengl/linux/Makefile b/packages/opengl/linux/Makefile index a28932f151..7763fdc0d5 100644 --- 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 diff --git a/packages/opengl/win32/Makefile b/packages/opengl/win32/Makefile index 280a1f9fa6..d249657aa1 100644 --- 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 diff --git a/packages/oracle/Makefile b/packages/oracle/Makefile index a8f4b707d7..6f8f7f3cd6 100644 --- 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 diff --git a/packages/paszlib/Makefile b/packages/paszlib/Makefile index 064906464b..5931f93abb 100644 --- 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 diff --git a/packages/postgres/Makefile b/packages/postgres/Makefile index cfff577791..26b44b1555 100644 --- 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 diff --git a/packages/regexpr/Makefile b/packages/regexpr/Makefile index 5088a307e9..a50c71d47a 100644 --- 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 diff --git a/packages/svgalib/Makefile b/packages/svgalib/Makefile index bb8534beab..882d0b76c6 100644 --- 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 diff --git a/packages/syslog/Makefile b/packages/syslog/Makefile index 49b09067dc..ed80c095a3 100644 --- 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 diff --git a/packages/uncgi/Makefile b/packages/uncgi/Makefile index f6e336ca13..93c1f3c038 100644 --- 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 diff --git a/packages/utmp/Makefile b/packages/utmp/Makefile index 64651f9d09..8e15b3e314 100644 --- 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 diff --git a/packages/x11/Makefile b/packages/x11/Makefile index 771d5b445f..b319c8bdf2 100644 --- 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 diff --git a/packages/zip/Makefile b/packages/zip/Makefile index b64f004aaf..bd8752d99a 100644 --- 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 diff --git a/packages/zlib/Makefile b/packages/zlib/Makefile index 7e9b5a1578..f7fb19adee 100644 --- 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 diff --git a/rtl/Makefile b/rtl/Makefile index 0f027216d7..95b5dc5456 100644 --- 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 diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile index 18877d1e9d..a655a42591 100644 --- 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 diff --git a/rtl/go32v1/Makefile b/rtl/go32v1/Makefile index b489bcfea4..b328bdd06a 100644 --- 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 diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index f948738cc4..cac23245b5 100644 --- 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 diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index fa81656430..7ca5dcace9 100644 --- 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 diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index 3e8c590047..94aeea3c05 100644 --- 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 diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 0ecfebb64e..ce5eb8464f 100644 --- 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 diff --git a/tests/Makefile b/tests/Makefile index 81e2fcb3a5..65a7c8741a 100644 --- 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 diff --git a/tests/units/Makefile b/tests/units/Makefile index 15a1b34c98..5b2ee812b1 100644 --- 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 diff --git a/utils/Makefile b/utils/Makefile index 4c839f5ddd..7888698bbd 100644 --- 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 diff --git a/utils/fprcp/Makefile b/utils/fprcp/Makefile index 0922b6fa47..ae592e7266 100644 --- 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 diff --git a/utils/h2pas/Makefile b/utils/h2pas/Makefile index cad1cb1ce3..cdac9b3c59 100644 --- 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 diff --git a/utils/simulator/Makefile b/utils/simulator/Makefile index 538274519e..1eb395a7d1 100644 --- 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 diff --git a/utils/tply/Makefile b/utils/tply/Makefile index fb21b0c710..1a1596bcbb 100644 --- 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