]>
Commit | Line | Data |
---|---|---|
b4a2ba28 JB |
1 | --- rpm-4.0/installplatform.orig Wed Sep 13 19:57:58 2000 |
2 | +++ rpm-4.0/installplatform Sun Dec 24 20:57:16 2000 | |
3 | @@ -21,11 +21,12 @@ | |
4 | ||
5 | RPM="./rpm --rcfile $TEMPRC" | |
6 | ||
7 | -arch="`$RPM --eval '%{_arch}'`" | |
8 | +CHARCH='s_i.86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_' | |
9 | +arch="`$RPM --eval '%{_arch}' | sed -e $CHARCH`" | |
10 | VENDOR="`$RPM --eval '%{_vendor}'`" | |
11 | OS="`$RPM --eval '%{_os}'`" | |
12 | -target_platform="`$RPM --eval '%{_target_platform}'`" | |
13 | -target="`$RPM --eval '%{_target}'`" | |
14 | +target_platform="`$RPM --eval '%{_target_platform}' | sed -e $CHARCH`" | |
15 | +target="`$RPM --eval '%{_target}' | sed -e $CHARCH`" | |
16 | ||
17 | rm -f ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS} | |
18 | ln -s ${arch}-${VENDOR}-${OS} ${DESTDIR}/${pkglibdir}/noarch-${VENDOR}-${OS} | |
19 | @@ -38,7 +39,6 @@ | |
20 | sparc*) SUBSTS='s_sparc\(64\|v9\)_sparc_ s_sparc64_sparcv9_;s_sparc\([^v]\|$\)_sparcv9\1_ s_sparcv9_sparc64_;s_sparc\([^6]\|$\)_sparc64\1_' ;; | |
21 | *) SUBSTS=y___ ;; | |
22 | esac | |
23 | -base_arch=`echo $arch | sed -e 's_i?86_i386_;s_sparc.*_sparc_;s_alpha.*_alpha_'` | |
24 | ||
25 | for SUBST in $SUBSTS ; do | |
26 | ARCH=`echo $arch | sed -e $SUBST` | |
27 | @@ -70,7 +70,7 @@ | |
28 | ||
29 | cat $PLATFORM | \ | |
30 | sed -e "s,@RPMRC_OPTFLAGS@,$RPMRC_OPTFLAGS," \ | |
31 | - -e "s,@RPMRC_ARCH@,$base_arch," \ | |
32 | + -e "s,@RPMRC_ARCH@,$arch," \ | |
33 | -e "s,@LIB@,$LIB," \ | |
34 | -e "s,@ARCH_INSTALL_POST@,$ARCH_INSTALL_POST," \ | |
35 | -e "s,@DEFAULTDOCDIR@,$DEFAULTDOCDIR," \ |