diff --git a/compiler/Makefile b/compiler/Makefile
index 9e9de409ba..7c8f6c887b 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v1.00 [2000/11/08]
+# Makefile generated by fpcmake v1.00 [2000/10/27]
 #
 
 defaultrule: all
@@ -103,25 +103,12 @@ 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
 #####################################################################
 
-# Define Unix also for Linux
-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
-
 # Don't export OS_SOURCE because it can change after the first compile
 unexport OS_SOURCE FPC_VERSION
 
@@ -167,6 +154,19 @@ endif
 
 # Message files
 MSGFILES=$(wildcard error*.msg)
+
+# Define Unix also for Linux
+ifeq ($(OS_TARGET),linux)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+override LOCALDEF+=-dUNIX
+endif
+endif
+
+ifeq ($(OS_TARGET),freebsd)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+override LOCALDEF+=-dUNIX
+endif
+endif
 #####################################################################
 # FPCDIR Setting
 #####################################################################
@@ -288,7 +288,7 @@ endif
 
 override LOCALOPT+=$(LOCALDEF)
 
-override FPCOPT+=$(LOCALOPT)
+override FPCOPT:=$(LOCALOPT)
 
 #####################################################################
 # Shell tools
diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index c6d49bafe9..bf74fb0b73 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -24,19 +24,6 @@ toolupx=1
 
 
 [presettings]
-# Define Unix also for Linux
-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
-
 # Don't export OS_SOURCE because it can change after the first compile
 unexport OS_SOURCE FPC_VERSION
 
@@ -83,6 +70,19 @@ endif
 # Message files
 MSGFILES=$(wildcard error*.msg)
 
+# Define Unix also for Linux
+ifeq ($(OS_TARGET),linux)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+override LOCALDEF+=-dUNIX
+endif
+endif
+
+ifeq ($(OS_TARGET),freebsd)
+ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
+override LOCALDEF+=-dUNIX
+endif
+endif
+
 
 [postsettings]
 # Default message file
@@ -99,7 +99,7 @@ endif
 
 override LOCALOPT+=$(LOCALDEF)
 
-override FPCOPT+=$(LOCALOPT)
+override FPCOPT:=$(LOCALOPT)
 
 
 [rules]