aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.txt3
-rwxr-xr-xconfigure4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index f7b7cc5..49e1c62 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,6 @@
+2012-07-24:
+ * (seebs) Fix a couple of bitrots from the update.
+
2012-07-20:
* (seebs) Add --cflags, deprecate --arch.
* (seebs) tag 1.4 (since this should now work on arbitrary targets)
diff --git a/configure b/configure
index c61f118..4a41943 100755
--- a/configure
+++ b/configure
@@ -23,7 +23,6 @@ opt_libdir=
opt_suffix=
opt_arch=x86
opt_bits=
-opt_arch=x86
opt_sqlite=/usr
opt_rpath=
@@ -115,7 +114,7 @@ if [ "${opt_cflags-UNSET}" = "UNSET" ]; then
echo >&2 "WARNING: Guessing architecture CFLAGS '${arch_flags-<unset>}'."
echo >&2 "If you need specific flags, use --cflags."
else
- eval arch_flags=\$opt_cflags
+ arch_flags=$opt_cflags
fi
if $use_maybe_rpath && [ -n "$maybe_rpath" ]; then
@@ -167,5 +166,4 @@ sed -e '
s,@MARK64@,'"$opt_mark64"',g
s,@ARCH@,'"$opt_arch"',g
s,@BITS@,'"$opt_bits"',g
- s,@CFLAGS@,'"$opt_cflags"',g
' < Makefile.in > Makefile