[newlisp/f17: 5/5] fix merge

[Peter Robinson]

commit 114f85454650d1de502e51367a30dd9034d4498d
Merge: e066959 9cc12a7
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Apr 16 18:35:08 2012 +0100

    fix merge

 newlisp-0002-Allow-to-override-CFLAGS.patch |    4 ++--
 newlisp.spec                                |   16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)
---
diff --cc newlisp.spec
index 4b4076a,4ea745c..c36311a
--- a/newlisp.spec
+++ b/newlisp.spec
@@@ -29,7 -33,10 +33,11 @@@ CFLAGS="%{optflags} -m64 -c -DREADLINE 
  	make -f makefile_linuxLP64 %{?_smp_mflags}
  %endif
  %ifarch %{ix86}
+ CFLAGS="%{optflags} -m32 -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
+ 	make -f makefile_linux %{?_smp_mflags}
+ %endif
+ %ifarch %{arm}
 +CFLAGS="%{optflags} -c -DREADLINE -DSUPPORT_UTF8 -DLINUX" \
  	make -f makefile_linux %{?_smp_mflags}
  %endif