summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2014-06-16 15:48:54 -0400
committerAdrian Thurston <thurston@complang.org>2014-06-16 15:48:54 -0400
commitf456fcf09f77742e7e152d24d176f52060426aae (patch)
tree43129724bbd1bd089081d41679a0c362e764b015
parentfc633086748169632e93b945259197ba46f27695 (diff)
downloadcolm-f456fcf09f77742e7e152d24d176f52060426aae.tar.gz
make -o work for binary compilation, bump to 0.12.10.12.1
-rw-r--r--configure.in4
-rw-r--r--src/main.cc3
2 files changed, 5 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index e057f941..cee3acde 100644
--- a/configure.in
+++ b/configure.in
@@ -18,8 +18,8 @@ dnl You should have received a copy of the GNU General Public License
dnl along with Colm; if not, write to the Free Software
dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-AC_INIT(colm, 0.12.0)
-PUBDATE="Jan 2014"
+AC_INIT(colm, 0.12.1)
+PUBDATE="June 2014"
AM_INIT_AUTOMAKE([foreign])
diff --git a/src/main.cc b/src/main.cc
index aaf46e6f..c7f929f6 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -248,6 +248,9 @@ char *fileNameFromStem( const char *stemFile, const char *suffix )
void openOutputCompiled()
{
+ /* Start with the fn given by -o option. */
+ binaryFn = outputFn;
+
if ( binaryFn == 0 )
binaryFn = fileNameFromStem( inputFn, 0 );