diff --git a/compiler/Makefile b/compiler/Makefile
index 5b5fd8df0a..ad5ceb2dbb 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-23 09:33
+# Makefile generated by fpcmake v0.99.13 on 1999-11-23 12:24
 #
 
 defaultrule: all
@@ -133,11 +133,11 @@ CPU_TARGET=i386
 endif
 
 # RTL
-RTL=../rtl
-UTILS=../utils
+RTLDIR=../rtl/$(OS_TARGET)
+UTILSDIR=../utils
 
 # Utils used by compiler development/installation
-COMPILERUTILS=utils
+COMPILERUTILSDIR=utils
 
 # Default language for the compiler
 ifndef FPCLANG
@@ -1094,9 +1094,9 @@ distclean: clean
 # Include depencies
 #####################################################################
 
-$(MAKEDEP): $(UTILS)/ppdep.pp
-	$(COMPILER) $(UTILS)/ppdep.pp
-	$(COPY) $(UTILS)/$(MAKEDEP) $(MAKEDEP)
+$(MAKEDEP): $(UTILSDIR)/ppdep.pp
+	$(COMPILER) $(UTILSDIR)/ppdep.pp
+	$(COPY) $(UTILSDIR)/$(MAKEDEP) $(MAKEDEP)
 
 dependencies : $(MAKEDEP)
 	$(MAKEDEP) pp.pas $(FPCOPTDEF) $(LOCALDEF) '-F$$(COMPILER) $$(LOCALOPT)' > depend
@@ -1112,8 +1112,8 @@ endif
 # Make targets
 #####################################################################
 
-$(MSG2INC): $(COMPILERUTILS)/msg2inc.pp
-	$(COMPILER) -FE. $(COMPILERUTILS)/msg2inc.pp
+$(MSG2INC): $(COMPILERUTILSDIR)/msg2inc.pp
+	$(COMPILER) -FE. $(COMPILERUTILSDIR)/msg2inc.pp
 
 # The msgtxt.inc only depends on the error?.msg file, not on msg2inc,
 # because that one will be new almost everytime
@@ -1205,7 +1205,7 @@ endif
 
 installlib: quickinstall
 ifdef inlinux
-	$(INSTALLEXE) $(COMPILERUTILS)/samplecfg $(BASEINSTALLDIR)/samplecfg
+	$(INSTALLEXE) $(COMPILERUTILSDIR)/samplecfg $(BASEINSTALLDIR)/samplecfg
 endif
 	$(MKDIR) $(MSGINSTALLDIR)
 	$(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)
diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index d195dfc0aa..0de9dbed89 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -30,11 +30,11 @@ CPU_TARGET=i386
 endif
 
 # RTL
-RTL=../rtl
-UTILS=../utils
+RTLDIR=../rtl/$(OS_TARGET)
+UTILSDIR=../utils
 
 # Utils used by compiler development/installation
-COMPILERUTILS=utils
+COMPILERUTILSDIR=utils
 
 # Default language for the compiler
 ifndef FPCLANG
@@ -174,9 +174,9 @@ distclean: clean
 # Include depencies
 #####################################################################
 
-$(MAKEDEP): $(UTILS)/ppdep.pp
-        $(COMPILER) $(UTILS)/ppdep.pp
-        $(COPY) $(UTILS)/$(MAKEDEP) $(MAKEDEP)
+$(MAKEDEP): $(UTILSDIR)/ppdep.pp
+        $(COMPILER) $(UTILSDIR)/ppdep.pp
+        $(COPY) $(UTILSDIR)/$(MAKEDEP) $(MAKEDEP)
 
 dependencies : $(MAKEDEP)
         $(MAKEDEP) pp.pas $(FPCOPTDEF) $(LOCALDEF) '-F$$(COMPILER) $$(LOCALOPT)' > depend
@@ -192,8 +192,8 @@ endif
 # Make targets
 #####################################################################
 
-$(MSG2INC): $(COMPILERUTILS)/msg2inc.pp
-        $(COMPILER) -FE. $(COMPILERUTILS)/msg2inc.pp
+$(MSG2INC): $(COMPILERUTILSDIR)/msg2inc.pp
+        $(COMPILER) -FE. $(COMPILERUTILSDIR)/msg2inc.pp
 
 # The msgtxt.inc only depends on the error?.msg file, not on msg2inc,
 # because that one will be new almost everytime
@@ -285,7 +285,7 @@ endif
 
 installlib: quickinstall
 ifdef inlinux
-        $(INSTALLEXE) $(COMPILERUTILS)/samplecfg $(BASEINSTALLDIR)/samplecfg
+        $(INSTALLEXE) $(COMPILERUTILSDIR)/samplecfg $(BASEINSTALLDIR)/samplecfg
 endif
         $(MKDIR) $(MSGINSTALLDIR)
         $(INSTALL) $(MSGFILES) $(MSGINSTALLDIR)