From aa1615c529682bf9f38a3f0569de24e71f8b2ded Mon Sep 17 00:00:00 2001
From: Olivier Thauvin <nanardon@mandriva.org>
Date: Sun, 1 May 2005 21:45:18 +0000
Subject: - fix optflags

---
 make_macrosfiles.sh.in | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'make_macrosfiles.sh.in')

diff --git a/make_macrosfiles.sh.in b/make_macrosfiles.sh.in
index 12bf942..93fd0be 100644
--- a/make_macrosfiles.sh.in
+++ b/make_macrosfiles.sh.in
@@ -49,18 +49,22 @@ case $ARCH in
     CANONARCH=s390x
     LIB=lib64;
     MULTILIBNO=2 ;;
+    *)
+    CANONARCH=$ARCH
+    LIB=lib
+    ;;
 esac
 
 if [ -n "$MULTILIBNO" ]; then
     MULTILIBSED='-e /^@MULTILIB/d -e s,@MULTILIBNO@,'$MULTILIBNO,
 else
-    MULTILIBSED='/^@MULTILIBSTART@/,/^@MULTILIBEND@/d'
+    MULTILIBSED='-e /^@MULTILIBSTART@/,/^@MULTILIBEND@/d'
 fi
 
 if [ -n "$OPTFLAGS" ]; then
     OPTFLAGSSED="s/@RPMOPTFLAGS@/${OPTFLAGS}/g"
 else
-    OPTFLAGSSED='-e s,^%optflags.*,,'
+    OPTFLAGSSED='s,^%optflags.*,,'
 fi
 
 cat "$MINPUT" | sed \
-- 
cgit v1.2.1