From 7075a9a2e19f81071df0897816c25f25152c71c9 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Fri, 16 May 2008 16:06:15 -0500
Subject: [PATCH] Clean up make.conf format.

---
 Timeline/Timeline.C |  6 ++++--
 configure           | 14 +++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Timeline/Timeline.C b/Timeline/Timeline.C
index 2851a6e..b293021 100644
--- a/Timeline/Timeline.C
+++ b/Timeline/Timeline.C
@@ -500,8 +500,10 @@ Timeline::draw_measure_lines ( int X, int Y, int W, int H, Fl_Color color )
     if ( ! draw_with_measure_lines )
         return;
 
-    Fl_Color colors[] = {  fl_color_average( FL_RED, color, 0.65f ),
-                           fl_color_average( FL_BLACK, color, 0.65f ) };
+    Fl_Color colors[2];
+
+    colors[1] = fl_color_average( FL_BLACK, color, 0.65f );
+    colors[0] = fl_color_average( FL_RED, colors[1], 0.65f );
 
     const nframes_t start = x_to_offset( X );
     const nframes_t length = x_to_ts( W );
diff --git a/configure b/configure
index 84573ff..5211f49 100755
--- a/configure
+++ b/configure
@@ -21,7 +21,7 @@ ask ()
 {
    echo -n "$1 [$BOLD$3$SGR0] "
    read R
-   echo "$2 := ${R:-$3}" >> make.conf
+   echo "${2}=${R:-$3}" >> make.conf
 }
 
 ok ()
@@ -60,7 +60,7 @@ else
     ok
 fi
 
-echo "FLTK_LIBS := `fltk-config --use-images --ldflags`" >> make.conf
+echo "FLTK_LIBS=`fltk-config --use-images --ldflags`" >> make.conf
 
 # 
 
@@ -77,12 +77,12 @@ check ()
     return 0
 }
 
-check JACK 0.103.0 jack && echo "JACK_LIBS := `pkg-config --libs jack`" >> make.conf
-check libSNDFILE 1.0.17 sndfile && echo "SNDFILE_LIBS := `pkg-config --libs sndfile`" >> make.conf
+check JACK 0.103.0 jack && echo "JACK_LIBS=`pkg-config --libs jack`" >> make.conf
+check libSNDFILE 1.0.17 sndfile && echo "SNDFILE_LIBS=`pkg-config --libs sndfile`" >> make.conf
 
-grep -q 'USE_LASH := yes' make.conf &&
+grep -q 'USE_LASH=yes' make.conf &&
 check LASH 0.5.4 lash-1.0 &&
-( echo "LASH_LIBS := `pkg-config --libs lash-1.0`" >> make.conf
-  echo "LASH_CFLAGS := -DUSE_LASH `pkg-config --cflags lash-1.0`" >> make.conf )
+( echo "LASH_LIBS=`pkg-config --libs lash-1.0`" >> make.conf
+  echo "LASH_CFLAGS=-DUSE_LASH `pkg-config --cflags lash-1.0`" >> make.conf )
 
 echo "-- Configuration complete."