From e050961f5e3ac26453992ca4de297bcb596f0bd7 Mon Sep 17 00:00:00 2001
From: Apple <opensource@apple.com>
Date: Tue, 4 Jun 2002 18:05:04 +0000
Subject: [PATCH] CoreOSMakefiles-21.tar.gz

---
 README                        |  6 +++---
 ReleaseControl/BSD.make       |  2 +-
 ReleaseControl/Common.make    | 10 +++++-----
 ReleaseControl/GNUSource.make |  2 +-
 ReleaseControl/README         |  3 +++
 Standard/Implicit.make        |  2 +-
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/README b/README
index ccfa4a4..ba8e481 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 Core OS Common Makefiles
 
-  These are some makefiles which are required to build some Rhapsody
+  These are some makefiles which are required to build some Darwin
 Core OS projects. Please note that these are not supported in any way
-outside of Core OS; they are subject to change without notice.
+outside of Darwin; they are subject to change without notice.
 
 	-Wilfredo Sanchez
-	 wsanchez@apple.com
+	 wsanchez@opensource.apple.com
diff --git a/ReleaseControl/BSD.make b/ReleaseControl/BSD.make
index 71cfd5e..16bd3b2 100644
--- a/ReleaseControl/BSD.make
+++ b/ReleaseControl/BSD.make
@@ -37,7 +37,7 @@ include $(CoreOSMakefiles)/ReleaseControl/Common.make
 
 CC_Debug += -Wall -Werror
 
-Extra_CC_Flags += -traditional-cpp
+Extra_CC_Flags += -no-cpp-precomp
 
 Environment = ARCH_FLAGS="$(CC_Archs)"	\
 	           COPTS="$(CFLAGS)"	\
diff --git a/ReleaseControl/Common.make b/ReleaseControl/Common.make
index 25d16a8..df5161b 100644
--- a/ReleaseControl/Common.make
+++ b/ReleaseControl/Common.make
@@ -45,19 +45,19 @@ include $(CoreOSMakefiles)/Standard/Standard.make
 # Some reasonable defaults for RC variables
 ##
 
-RC_ARCHS   = ppc i386
+RC_ARCHS   = $(shell file /usr/lib/libSystem.B.dylib | grep 'shared library ' | sed 's|.*shared library ||')
 RC_RELEASE = unknown
 RC_VERSION = unknown
 
 ifeq ($(COPY_SOURCES),YES)
-SRCROOT = /tmp/$(Project)/Sources
+SRCROOT = /tmp/$(ProjectName)/Sources
 else
 SRCROOT = $(shell pwd)
 endif
 
-OBJROOT = /tmp/$(Project)/Build
-SYMROOT = /tmp/$(Project)/Debug
-DSTROOT = /tmp/$(Project)/Release
+OBJROOT = /tmp/$(ProjectName)/Build
+SYMROOT = /tmp/$(ProjectName)/Debug
+DSTROOT = /tmp/$(ProjectName)/Release
 
 ##
 # My variables
diff --git a/ReleaseControl/GNUSource.make b/ReleaseControl/GNUSource.make
index c52a2e6..d287a65 100644
--- a/ReleaseControl/GNUSource.make
+++ b/ReleaseControl/GNUSource.make
@@ -65,7 +65,7 @@ Install_Info = $(SHAREDIR)/info
 endif
 ifndef Install_HTML
 ifeq "$(UserType)" "Developer"
-Install_HTML = $(NSDEVELOPERDIR)/Documentation/$(ToolType)/$(ProjectName)
+Install_HTML = $(NSDEVELOPERDIR)/Documentation/DeveloperTools/$(ProjectName)
 else
 Install_HTML = $(NSDOCUMENTATIONDIR)/$(ToolType)/$(ProjectName)
 endif
diff --git a/ReleaseControl/README b/ReleaseControl/README
index e761539..02b67f3 100644
--- a/ReleaseControl/README
+++ b/ReleaseControl/README
@@ -12,3 +12,6 @@ and install.
 
   GNUSource.make implements the build and install targets for sources
 which use GNU autoconf's configure script to build.
+
+  BSDSource.make implements the build and install targets for sources
+which use BSD makefiles to build.
diff --git a/Standard/Implicit.make b/Standard/Implicit.make
index db18ae5..c89ad05 100644
--- a/Standard/Implicit.make
+++ b/Standard/Implicit.make
@@ -36,7 +36,7 @@ ifeq ($(DEBUG),YES)
 CC_Optimize = 
 LD_Prebind  = 
 else
-CC_Optimize = -O3
+CC_Optimize = -Os
 endif
 CC_Other    = -pipe
 
-- 
2.45.2