From a8d6c1961d00d6f48ebb0984669b93cf7ccd711c Mon Sep 17 00:00:00 2001
From: olle <olle>
Date: Wed, 4 Feb 2004 15:10:37 +0000
Subject: [PATCH]   * misc fixes

---
 rtl/macos/Makefile     | 82 ++++++++++--------------------------------
 rtl/macos/Makefile.fpc | 32 ++++++++---------
 2 files changed, 34 insertions(+), 80 deletions(-)

diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
index 0c06da08bb..49fb835462 100644
--- a/rtl/macos/Makefile
+++ b/rtl/macos/Makefile
@@ -1,8 +1,8 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2003/06/27]
 #
 default: all
-MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
+MAKEFILETARGETS=win32
 override PATH:=$(subst \,/,$(PATH))
 ifeq ($(findstring ;,$(PATH)),)
 inUnix=1
@@ -10,7 +10,6 @@ SEARCHPATH:=$(filter-out .,$(subst :, ,$(PATH)))
 else
 SEARCHPATH:=$(subst ;, ,$(PATH))
 endif
-SEARCHPATH+=$(patsubst %/,%,$(subst \,/,$(dir $(MAKE))))
 PWD:=$(strip $(wildcard $(addsuffix /pwd.exe,$(SEARCHPATH))))
 ifeq ($(PWD),)
 PWD:=$(strip $(wildcard $(addsuffix /pwd,$(SEARCHPATH))))
@@ -308,17 +307,9 @@ endif
 endif
 ifndef INSTALL_BINDIR
 ifdef UNIXINSTALLDIR
-ifdef CROSSCOMPILE
-INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
-else
 INSTALL_BINDIR:=$(INSTALL_PREFIX)/bin
-endif
-else
-ifdef CROSSCOMPILE
-INSTALL_BINDIR:=$(INSTALL_BASEDIR)/cross/$(FULL_TARGET)/bin
 else
 INSTALL_BINDIR:=$(INSTALL_BASEDIR)/bin
-endif
 ifdef INSTALL_FPCPACKAGE
 INSTALL_BINDIR:=$(INSTALL_BINDIR)/$(OS_TARGET)
 endif
@@ -450,14 +441,6 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
-ifeq ($(OS_TARGET),watcom)
-STATICLIBPREFIX=
-FPCMADE=fpcmade.wat
-ZIPSUFFIX=watc
-OEXT=.obj
-ASMEXT=.asm
-SHAREDLIBEXT=.dll
-endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@@ -560,11 +543,6 @@ STATICLIBPREFIX=
 FPCMADE=fpcmade.dos
 ZIPSUFFIX=go32
 endif
-ifeq ($(OS_TARGET),watcom)
-STATICLIBPREFIX=
-FPCMADE=fpcmade.dos
-ZIPSUFFIX=watcom
-endif
 ifeq ($(OS_TARGET),linux)
 EXEEXT=
 HASSHAREDLIB=1
@@ -753,11 +731,7 @@ endif
 endif
 export MVPROG
 ifndef ECHOREDIR
-ifndef inUnix
-ECHOREDIR=echo
-else
-ECHOREDIR=$(ECHO)
-endif
+ECHOREDIR:=$(subst /,$(PATHSEP),$(ECHO))
 endif
 ifndef COPY
 COPY:=$(CPPROG) -fp
@@ -828,16 +802,14 @@ TARPROG:=$(firstword $(TARPROG))
 endif
 endif
 export TARPROG
-ASNAME=$(BINUTILSPREFIX)as
-LDNAME=$(BINUTILSPREFIX)ld
-ARNAME=$(BINUTILSPREFIX)ar
-RCNAME=$(BINUTILSPREFIX)rc
-ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
-ifeq ($(OS_TARGET),win32)
 ASNAME=as
 LDNAME=ld
 ARNAME=ar
-endif
+RCNAME=rc
+ifeq ($(OS_TARGET),win32)
+ASNAME=asw
+LDNAME=ldw
+ARNAME=arw
 endif
 ifndef ASPROG
 ifdef CROSSBINDIR
@@ -919,14 +891,6 @@ endif
 ifeq ($(OS_SOURCE),openbsd)
 override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
 endif
-ifndef CROSSBOOTSTRAP
-ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-XP$(BINUTILSPREFIX) -Xc
-endif
-ifneq ($(BINUTILSPREFIX),)
-override FPCOPT+=-Xr$(RLINKPATH)
-endif
-endif
 ifdef UNITDIR
 override FPCOPT+=$(addprefix -Fu,$(UNITDIR))
 endif
@@ -1058,7 +1022,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .pp .rc .res
 %$(PPUEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
@@ -1071,14 +1035,10 @@ fpc_release:
 %$(EXEEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.dpr
-	$(COMPILER) $<
-	$(EXECPPAS)
 %.res: %.rc
 	windres -i $< -o $@
 vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
 ifdef INSTALL_UNITS
@@ -1322,25 +1282,19 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
 include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-system$(PPUEXT) : system.pp $(SYSLINUXDEPS) $(SYSDEPS)
-  $(COMPILER) -Us -Sg system.pp $(REDIR)
-strings$(PPUEXT) : ../template/strings.pp system$(PPUEXT)
-  $(COMPILER) ../template/strings.pp $(REDIR)
-exec$(PPUEXT) : exec.pp exec.inc system$(PPUEXT)
-  $(COMPILER) exec $(REDIR)
+system$(PPUEXT) : system.pp $(SYSDEPS)
+	$(COMPILER) -Us -Sg system.pp $(REDIR)
+strings$(PPUEXT) : $(INC)/strings.pp system$(PPUEXT)
+	$(COMPILER) $(INC)/strings.pp $(REDIR)
 objpas$(PPUEXT) : $(OBJPASDIR)/objpas.pp system$(PPUEXT)
-  $(COPY) $(OBJPASDIR)/objpas.pp .
-  $(COMPILER) objpas $(REDIR)
-  $(DEL) objpas.pp
+	$(COPY) $(OBJPASDIR)/objpas.pp .
+	$(COMPILER) objpas $(REDIR)
+	$(DEL) objpas.pp
 sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp objpas$(PPUEXT) system$(PPUEXT) sysconst$(PPUEXT)
-  $(COPY) $(OBJPASDIR)/sysutils.pp .
-  $(COMPILER) sysutils $(REDIR)
+	$(COPY) $(OBJPASDIR)/sysutils.pp .
+	$(COMPILER) sysutils $(REDIR)
 dos$(PPUEXT) : $(DOSDEPS) system$(PPUEXT)
 	$(COMPILER) dos $(REDIR)
-crt$(PPUEXT) : crt.pp $(INC)/textrec.inc system$(PPUEXT)
-	$(COMPILER) crt $(REDIR)
-printer$(PPUEXT) : printer.pp system$(PPUEXT)
-	$(COMPILER) printer $(REDIR)
 objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT)
 	$(COMPILER) $(INC)/objects.pp $(REDIR)
 getopts$(PPUEXT) : $(INC)/getopts.pp strings$(PPUEXT) system$(PPUEXT)
diff --git a/rtl/macos/Makefile.fpc b/rtl/macos/Makefile.fpc
index c41d546bd4..d3a6e4022c 100644
--- a/rtl/macos/Makefile.fpc
+++ b/rtl/macos/Makefile.fpc
@@ -1,5 +1,5 @@
 #
-#   Makefile.fpc for Amiga RTL
+#   Makefile.fpc for Free Pascal MacOS RTL
 #
 
 [package]
@@ -86,27 +86,27 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 # Base Units (System, strings, os-dependent-base-unit)
 #
 
-system$(PPUEXT) : system.pp $(SYSLINUXDEPS) $(SYSDEPS)
-  $(COMPILER) -Us -Sg system.pp $(REDIR)
+system$(PPUEXT) : system.pp $(SYSDEPS)
+	$(COMPILER) -Us -Sg system.pp $(REDIR)
 
-strings$(PPUEXT) : ../template/strings.pp system$(PPUEXT)
-  $(COMPILER) ../template/strings.pp $(REDIR)
+strings$(PPUEXT) : $(INC)/strings.pp system$(PPUEXT)
+	$(COMPILER) $(INC)/strings.pp $(REDIR)
 
-exec$(PPUEXT) : exec.pp exec.inc system$(PPUEXT)
-  $(COMPILER) exec $(REDIR)
+#exec$(PPUEXT) : exec.pp exec.inc system$(PPUEXT)
+#	$(COMPILER) exec $(REDIR)
 
 #
 # Delphi Object Model
 #
 
 objpas$(PPUEXT) : $(OBJPASDIR)/objpas.pp system$(PPUEXT)
-  $(COPY) $(OBJPASDIR)/objpas.pp .
-  $(COMPILER) objpas $(REDIR)
-  $(DEL) objpas.pp
+	$(COPY) $(OBJPASDIR)/objpas.pp .
+	$(COMPILER) objpas $(REDIR)
+	$(DEL) objpas.pp
 
 sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp objpas$(PPUEXT) system$(PPUEXT) sysconst$(PPUEXT)
-  $(COPY) $(OBJPASDIR)/sysutils.pp .
-  $(COMPILER) sysutils $(REDIR)
+	$(COPY) $(OBJPASDIR)/sysutils.pp .
+	$(COMPILER) sysutils $(REDIR)
 #$(DEL) sysutils.pp
 
 #
@@ -120,11 +120,11 @@ sysutils$(PPUEXT) : $(OBJPASDIR)/sysutils.pp objpas$(PPUEXT) system$(PPUEXT) sys
 dos$(PPUEXT) : $(DOSDEPS) system$(PPUEXT)
         $(COMPILER) dos $(REDIR)
 
-crt$(PPUEXT) : crt.pp $(INC)/textrec.inc system$(PPUEXT)
-        $(COMPILER) crt $(REDIR)
+#crt$(PPUEXT) : crt.pp $(INC)/textrec.inc system$(PPUEXT)
+#        $(COMPILER) crt $(REDIR)
 
-printer$(PPUEXT) : printer.pp system$(PPUEXT)
-        $(COMPILER) printer $(REDIR)
+#printer$(PPUEXT) : printer.pp system$(PPUEXT)
+#        $(COMPILER) printer $(REDIR)
 
 objects$(PPUEXT) : $(INC)/objects.pp system$(PPUEXT)
         $(COMPILER) $(INC)/objects.pp $(REDIR)