diff --git a/src/make.new/prefix.darwin b/src/make.new/prefix.darwin
index a1d1753a7f..daed1e1458 100644
--- a/src/make.new/prefix.darwin
+++ b/src/make.new/prefix.darwin
@@ -15,7 +15,7 @@
 # All Rights Reserved.
 # Contributor(s): ______________________________________.
 # Start of file prefix.darwin:	$(VERSION)	@PLATFORM@
-#$Id: prefix.darwin,v 1.2 2001-08-04 22:48:18 bellardo Exp $
+#$Id: prefix.darwin,v 1.3 2001-08-07 00:41:03 bellardo Exp $
 
 
 #_____________________________________________________________________________
@@ -33,31 +33,6 @@
 
 # adding another dependancy onto the includes target
 
-includes: include_darwin
-
-include_darwin: 
-	$(RM) -rf $(FB_FRAMEWORK)
-	mkdir -p $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var
-	ln -s Versions/Current/$(FBFW_PREFIX) $(FB_FRAMEWORK)/$(FBFW_PREFIX)
-	ln -s Versions/Current/Resources $(FB_FRAMEWORK)/Resources
-	ln -s Versions/Current/Headers $(FB_FRAMEWORK)/Headers
-	ln -s A $(FB_FRAMEWORK)/Versions/Current
-	sed "s/__VERSION__/`$(GPRE_BOOT) -Z | sed 's/gpre version //g'`/g" $(SOURCE)/sandbox/bellardo/darwin/FrameworkInfo.plist > $(FB_FRAMEWORK)/Resources/Info.plist
-	ln -s ../../../include $(FB_FRAMEWORK)/Versions/A/Headers
-	ln -s ../../../lib/gds.dylib $(FB_FRAMEWORK)/Versions/A/$(FBFW_PREFIX)
-	ln -s ../../../../../../interbase.msg \
-		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/interbase.msg
-	ln -s ../../../../../../bin \
-		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/bin
-	ln -s ../../../../../../intl \
-		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/intl
-	ln -s ../../../../../../isc4.gdb \
-		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/isc4.gdb
-	ln -s ../../../../../../help \
-		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/help
-
-
-
 
 # End add by me MOD 26-July-2001
 #______________________________________________________________________________
@@ -75,24 +50,13 @@ endif
 
 
 
-PROD_DEBUG_OBJECTS=	nodebug.o
-PROD_SHRLIB_DIR=	
-PROD_VERSION_FLAG=	-DPROD_BUILD
-PROD_CFLAGS=            -O3
-
-
-DEV_DEBUG_OBJECTS=	grammar.o dbg.o dbt.o dmp.o
-DEV_SHRLIB_DIR=		
-DEV_VERSION_FLAG=	-DDEV_BUILD
-DEV_CFLAGS=		-ggdb
-
 FBFW_PREFIX=		Firebird2
 FW_NAME=		$(FBFW_PREFIX).framework
-FW_PATH=		$(OBJS)/firebird
+FW_PATH=		$(FIREBIRD)
 FB_FRAMEWORK=		$(FW_PATH)/$(FW_NAME)
 FW_VERS=		1.1.0
 FW_COMPAT_VERS=		1.0.0
-PHASE2_SHLIB_PATH=	unset INTERBASE; export DYLD_FRAMEWORK_PATH=$(OBJS)/firebird;
+PHASE2_SHLIB_PATH=	unset INTERBASE; export DYLD_FRAMEWORK_PATH=$(FIREBIRD);
 POST_BUILD_TARGET=	darwin_framework
 SS_POST_BUILD_TARGET=	ss_darwin_framework
 
@@ -241,4 +205,37 @@ CXXFLAGS:= $(CXXFLAGS) $(CFLAGS)
 
 
 
+# Set DYLD_FRAMEWORK_PATH to point to the framework we are building.
+
+export DYLD_FRAMEWORK_PATH
+DYLD_FRAMEWORK_PATH := $(FIREBIRD)
+
+
+
+# The target to generate our psuedo framework for use when compiling.
+
+firebird: darwin_pseudo_fw
+darwin_pseudo_fw: 
+	$(RM) -rf $(FB_FRAMEWORK)
+	mkdir -p $(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var
+	ln -s Versions/Current/$(FBFW_PREFIX) $(FB_FRAMEWORK)/$(FBFW_PREFIX)
+	ln -s Versions/Current/Resources $(FB_FRAMEWORK)/Resources
+	ln -s Versions/Current/Headers $(FB_FRAMEWORK)/Headers
+	ln -s A $(FB_FRAMEWORK)/Versions/Current
+	sed "s/__VERSION__/0.0.boot/g" $(SRC_ROOT)/install/arch-specific/darwin/FrameworkInfo.plist > $(FB_FRAMEWORK)/Resources/Info.plist
+	ln -s ../../../include $(FB_FRAMEWORK)/Versions/A/Headers
+	ln -s ../../../lib/libgds.dylib $(FB_FRAMEWORK)/Versions/A/$(FBFW_PREFIX)
+	ln -s ../../../../../../interbase.msg \
+		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/interbase.msg
+	ln -s ../../../../../../bin \
+		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/bin
+	ln -s ../../../../../../intl \
+		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/intl
+	ln -s ../../../../../../isc4.gdb \
+		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/isc4.gdb
+	ln -s ../../../../../../help \
+		$(FB_FRAMEWORK)/Versions/A/Resources/English.lproj/var/help
+
+
+
 #   End of file prefix.darwin:	$(VERSION)	$(PLATFORM)