summaryrefslogtreecommitdiff
path: root/acprep
diff options
context:
space:
mode:
authorCraig Earls <enderw88@gmail.com>2014-11-07 18:21:13 -0700
committerCraig Earls <enderw88@gmail.com>2014-11-07 18:21:13 -0700
commitaf15887ecb32cdacea8a0a487f8b94dd81f98383 (patch)
treecccfad949f3a2511bc0ef5071b818503290b9842 /acprep
parent1bd67755fa3127d80b7534d15f1f9de1b477c19a (diff)
parent62e1354e0bb9bef2efaed14e3543199880026491 (diff)
downloadfork-ledger-af15887ecb32cdacea8a0a487f8b94dd81f98383.tar.gz
fork-ledger-af15887ecb32cdacea8a0a487f8b94dd81f98383.tar.bz2
fork-ledger-af15887ecb32cdacea8a0a487f8b94dd81f98383.zip
Merge branch 'master' of https://github.com/ledger/ledger
Diffstat (limited to 'acprep')
-rwxr-xr-xacprep9
1 files changed, 3 insertions, 6 deletions
diff --git a/acprep b/acprep
index a6cadc7f..b0af2108 100755
--- a/acprep
+++ b/acprep
@@ -1,10 +1,7 @@
#!/usr/bin/env python
-# acprep, version 3.0
+# acprep, version 3.1
#
-# This script configures my ledger source tree on my Mac OS/X machine. This
-# is not necessary, however, since I keep all the files necessary for building
-# checked in to the source tree. Users can just type './configure && make'.
# This script simply sets up the compiler and linker flags for all the various
# build permutations I use for testing and profiling.
@@ -802,7 +799,7 @@ class PrepareBuild(CommandLineApp):
conf_args.append('-DCMAKE_CXX_FLAGS=%s' %
self.envvars[var])
elif var == 'LDFLAGS':
- conf_args.append('-DCMAKE_EXE_LINKER_FLAGS=%s' %
+ conf_args.append('-DCMAKE_EXE_LINKER_FLAGS=%s' %
self.envvars[var])
if self.options.boost_root:
@@ -895,7 +892,7 @@ class PrepareBuild(CommandLineApp):
self.log.debug('Changing directory to ' + build_dir)
os.chdir(build_dir)
- self.execute(*(['ninja' if self.options.use_ninja else 'make'] +
+ self.execute(*(['ninja' if self.options.use_ninja else 'make'] +
make_args))
finally:
os.chdir(self.source_dir)