diff options
| author | Olivier Thauvin <nanardon@mandriva.org> | 2005-05-01 00:41:33 +0000 |
|---|---|---|
| committer | Olivier Thauvin <nanardon@mandriva.org> | 2005-05-01 00:41:33 +0000 |
| commit | a56aeeec184a7570eeeaa6a85b3760eddeb04397 (patch) | |
| tree | d636e51d2801e19b75f8b45cb175026e41ca27ab /make_macrosfiles.sh.in | |
| parent | c1e98e63ced7c7cf0a96eb7344dce8c70a2374a3 (diff) | |
| download | rpm-setup-a56aeeec184a7570eeeaa6a85b3760eddeb04397.tar rpm-setup-a56aeeec184a7570eeeaa6a85b3760eddeb04397.tar.gz rpm-setup-a56aeeec184a7570eeeaa6a85b3760eddeb04397.tar.bz2 rpm-setup-a56aeeec184a7570eeeaa6a85b3760eddeb04397.tar.xz rpm-setup-a56aeeec184a7570eeeaa6a85b3760eddeb04397.zip | |
- add rpmpopt
- fix optflags in macros
Diffstat (limited to 'make_macrosfiles.sh.in')
| -rw-r--r-- | make_macrosfiles.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
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 |