[or-cvs] [tor/maint-0.2.1] update the README instructions and OS X makefiles

[Nick Mathewson]

Author: phobos <phobos at phobos-laptop.(none)>
Date: Sun, 30 Aug 2009 20:40:02 -0400
Subject: update the README instructions and OS X makefiles
Commit: ca5e41afd7e3cb164b7c3ac99c8a338a121f682f

---
 contrib/polipo/Makefile.osx |   10 +++++++---
 contrib/polipo/README       |    2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/contrib/polipo/Makefile.osx b/contrib/polipo/Makefile.osx
index 8e748e2..55ed1c6 100644
--- a/contrib/polipo/Makefile.osx
+++ b/contrib/polipo/Makefile.osx
@@ -30,9 +30,13 @@ FILE_DEFINES = -DLOCAL_ROOT=\"$(LOCAL_ROOT)/\" \
 
 DEFINES = $(FILE_DEFINES) $(PLATFORM_DEFINES)
 
-UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
-LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
-CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL)
+# Uncomment the UNIVERSAL, LDFLAGS, CFLAGS lines if you want universal binaries, otherwise
+# you'll produce a binary only for your architecture and version of OSX
+# UNIVERSAL = -O -g -mmacosx-version-min=10.4 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc
+# LDFLAGS = -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk
+# CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) $(UNIVERSAL)
+# If you uncommented the above CFLAGS, remove this next one.
+CFLAGS = $(MD5INCLUDES) $(CDEBUGFLAGS) $(DEFINES) $(EXTRA_DEFINES) 
 
 SRCS = util.c event.c io.c chunk.c atom.c object.c log.c diskcache.c main.c \
        config.c local.c http.c client.c server.c auth.c tunnel.c \
diff --git a/contrib/polipo/README b/contrib/polipo/README
index 038e354..e05ab0c 100644
--- a/contrib/polipo/README
+++ b/contrib/polipo/README
@@ -1,4 +1,6 @@
 Copyright 2007-2008 Andrew Lewman
+Copyright 2009 The Tor Project
+
 ----------------
 General Comments
 ----------------
-- 
1.5.6.5