diff options
author | Olivier Thauvin <nanardon@mandriva.org> | 2005-05-01 21:45:18 +0000 |
---|---|---|
committer | Olivier Thauvin <nanardon@mandriva.org> | 2005-05-01 21:45:18 +0000 |
commit | aa1615c529682bf9f38a3f0569de24e71f8b2ded (patch) | |
tree | 038f3e8c2ff599a41c2031bf46a595f1883d464b /make_macrosfiles.sh.in | |
parent | db95cf3f46a569a97c3d7ab231e975a7d32c4f44 (diff) | |
download | rpm-setup-aa1615c529682bf9f38a3f0569de24e71f8b2ded.tar rpm-setup-aa1615c529682bf9f38a3f0569de24e71f8b2ded.tar.gz rpm-setup-aa1615c529682bf9f38a3f0569de24e71f8b2ded.tar.bz2 rpm-setup-aa1615c529682bf9f38a3f0569de24e71f8b2ded.tar.xz rpm-setup-aa1615c529682bf9f38a3f0569de24e71f8b2ded.zip |
- fix optflags
Diffstat (limited to 'make_macrosfiles.sh.in')
-rw-r--r-- | make_macrosfiles.sh.in | 8 |
1 files changed, 6 insertions, 2 deletions
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 \ |