From 82bb38d00a49e30e5a316c1478d2020a6b0e0f49 Mon Sep 17 00:00:00 2001
From: aafemt <aafemt@users.sourceforge.net>
Date: Tue, 13 Mar 2007 05:28:49 +0000
Subject: [PATCH] Move some of darwin hacks to appropriate place

---
 builds/posix/make.defaults |  4 ----
 builds/posix/make.rules    | 13 -------------
 builds/posix/prefix.darwin |  2 ++
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
index 9a9a149710..e1f694b447 100755
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@@ -80,11 +80,7 @@ IsProdTypeBuild = @PROD_BUILD_FLG@
                            # release with debug and optimization
 
 
-ifeq ($(PLATFORM),DARWIN)
-FirebirdInstallPrefix =
-else
 FirebirdInstallPrefix = @prefix@
-endif
 CpuType=@CPU_TYPE@
 
 PLATFORM=@PLATFORM@
diff --git a/builds/posix/make.rules b/builds/posix/make.rules
index f7f281247a..b181a636fa 100644
--- a/builds/posix/make.rules
+++ b/builds/posix/make.rules
@@ -42,19 +42,6 @@ endif
 
 CXXFLAGS:= $(CXXFLAGS) $(CFLAGS)
 
-ifeq ($(PLATFORM),DARWIN)
-LIB_LINK = g++
-else
-LIB_LINK= @CC@
-endif
-STATICLIB_LINK= ar cruvs
-EXE_LINK = @CXX@
-STATICEXE_LINK = @CXX@
-
-LINK_LIBS = @LIBS@ @EDITLINE_A@
-ICU_LIBS = -licuuc -licudata -licui18n
-STATICLINK_LIBS = @LIBS@ @EDITLINE_A@
-SO_LINK_LIBS = @LIBS@
 # Here we have definitions for using the preprocessor.
 
 # The GPRE_FLAGS is overwritten in Makefile.in.jrd Makefile.in.gpre and
diff --git a/builds/posix/prefix.darwin b/builds/posix/prefix.darwin
index 565b700807..3d24f6d328 100644
--- a/builds/posix/prefix.darwin
+++ b/builds/posix/prefix.darwin
@@ -31,7 +31,9 @@ CLIENT_UTIL_TARGETS=gds_drop gds_relay gstat gsec fbguard fbmgr_bin nbackup fb_l
 
 Physical_IO_Module=os/posix/unix.cpp
 PLATFORM_PATH=os/darwin
+FirebirdInstallPrefix =
 
+LIB_LINK=g++
 LINK_OPTS:=
 LIB_BUNDLE_OPTIONS:=$(LD_FLAGS) -bundle -flat_namespace -undefined suppress
 LIB_LINK_OPTIONS:=$(LD_FLAGS) -dynamiclib  -flat_namespace