From a56aeeec184a7570eeeaa6a85b3760eddeb04397 Mon Sep 17 00:00:00 2001
From: Olivier Thauvin <nanardon@mandriva.org>
Date: Sun, 1 May 2005 00:41:33 +0000
Subject: - add rpmpopt - fix optflags in macros

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

(limited to 'make_macrosfiles.sh.in')

diff --git a/make_macrosfiles.sh.in b/make_macrosfiles.sh.in
index cb8978e..12bf942 100644
--- a/make_macrosfiles.sh.in
+++ b/make_macrosfiles.sh.in
@@ -54,11 +54,11 @@ esac
 if [ -n "$MULTILIBNO" ]; then
     MULTILIBSED='-e /^@MULTILIB/d -e s,@MULTILIBNO@,'$MULTILIBNO,
 else
-    MULTILIBSED='-e /^@MULTILIBSTART@/,/^@MULTILIBEND@/d'
+    MULTILIBSED='/^@MULTILIBSTART@/,/^@MULTILIBEND@/d'
 fi
 
 if [ -n "$OPTFLAGS" ]; then
-    OPTFLAGSSED='-e s,@RPMOPTFLAGS@,$OPTFLAGS,g'
+    OPTFLAGSSED="s/@RPMOPTFLAGS@/${OPTFLAGS}/g"
 else
     OPTFLAGSSED='-e s,^%optflags.*,,'
 fi
@@ -66,5 +66,5 @@ fi
 cat "$MINPUT" | sed \
     -e "s,@RPMARCH@,$CANONARCH,g" \
     -e "s,@LIB@,$LIB,g" \
-    $OPTFLAGSSED \
+    -e "$OPTFLAGSSED" \
     $MULTILIBSED
-- 
cgit v1.2.1