From 24fc856664b2925fe4aff73b2684e4baa663906c Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 14 Nov 2009 16:19:07 -0500
Subject: Added README notes about building on OS X

---
 README-1ST | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'README-1ST')

diff --git a/README-1ST b/README-1ST
index 0b831828..9eb1349c 100644
--- a/README-1ST
+++ b/README-1ST
@@ -1,15 +1,34 @@
 
-                                 README FIRST!!!
-
 ===============================================================================
 
+                                 README FIRST!!!
+
 To build this code after doing a Git clone, run:
 
     $ ./acprep update
 
-If you try to configure/build on your own, you are almost certainly going to
-run into problems.  In future, you can run this command again and it will keep
-you updated with the very latest version.
+If you try to configure and build on your own, you are almost certainly going
+to run into problems.  In future, you can run this command again and again,
+and it will keep you updated to the very latest version.
+
+===============================================================================
+
+			   NOTE FOR MAC OS X USERS
+
+To build and install Ledger on the Mac requires several dependencies.  If you
+are a MacPorts user, you can install these dependencies very simply using:
+
+    $ ./acprep dependencies
+
+Once this is done, I recommend building both debug and optimized versions of
+Ledger, in a subdirectory of your source tree named 'build':
+
+    $ mkdir build
+    $ ./acprep opt make
+    $ ./acprep debug make
+
+Now install the optimized version, but know that you have 'build/debug/ledger'
+available for testing and more useful bug reports.
 
 ===============================================================================
 
-- 
cgit v1.2.3


From 8d698e5ccb471d546eee8a5bea6d6c56ec4b08c3 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sat, 14 Nov 2009 17:43:19 -0500
Subject: Don't use GLIBCXX_DEBUG only for opt builds

---
 README-1ST | 3 ++-
 acprep     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'README-1ST')

diff --git a/README-1ST b/README-1ST
index 9eb1349c..2dc12192 100644
--- a/README-1ST
+++ b/README-1ST
@@ -21,7 +21,8 @@ are a MacPorts user, you can install these dependencies very simply using:
     $ ./acprep dependencies
 
 Once this is done, I recommend building both debug and optimized versions of
-Ledger, in a subdirectory of your source tree named 'build':
+Ledger, in a subdirectory of your source tree named 'build' (which acprep will
+manage for you, you simply need to make it):
 
     $ mkdir build
     $ ./acprep opt make
diff --git a/acprep b/acprep
index 897c3772..bf582cf5 100755
--- a/acprep
+++ b/acprep
@@ -745,7 +745,7 @@ class PrepareBuild(CommandLineApp):
                 self.sys_library_dirs.append(path)
 
     def setup_for_johnw(self):
-        if self.current_flavor == 'debug':
+        if self.current_flavor != 'opt':
             if exists('/usr/local/stow/cppunit/include'):
                 self.sys_include_dirs.insert(0, '/usr/local/stow/cppunit/include')
                 self.sys_library_dirs.insert(0, '/usr/local/stow/cppunit/lib')
@@ -972,7 +972,7 @@ class PrepareBuild(CommandLineApp):
     #########################################################################
 
     def locate_darwin_libraries(self):
-        if self.current_flavor == 'debug':
+        if self.current_flavor != 'opt':
             self.log.debug('We are using GLIBCXX_DEBUG, so setting up flags')
 
             if self.options.use_glibcxx_debug:
-- 
cgit v1.2.3