Don't use GLIBCXX_DEBUG only for opt builds

2 files changed, 4 insertions, 3 deletions

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: