diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2011-03-25 13:22:53 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2011-03-25 13:22:53 +0200 |
| commit | ad0da75a0d6c0bd7f32133bc5cd05636ae470257 (patch) | |
| tree | 42f15b23d80a39077fd068c2abb55ec08780776f /installplatform | |
| parent | 6ee4b20959327725da2b17fd116ddcc5c8bdbf7c (diff) | |
| download | rpm-ad0da75a0d6c0bd7f32133bc5cd05636ae470257.tar.gz rpm-ad0da75a0d6c0bd7f32133bc5cd05636ae470257.tar.bz2 rpm-ad0da75a0d6c0bd7f32133bc5cd05636ae470257.zip | |
Simplify the hysterical per-platform vendor-sed thing
Diffstat (limited to 'installplatform')
| -rwxr-xr-x | installplatform | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/installplatform b/installplatform index 5973a1810..853c72144 100755 --- a/installplatform +++ b/installplatform @@ -108,29 +108,6 @@ for SUBST in $SUBSTS ; do ;; esac - case $VENDOR in - yellowdog) - VENDORSED='-e s,^@yellowdog@,,' - ;; - pld) - VENDORSED='-e s,^@pld@,,' - RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e "s/ -g/ /"`" - ;; - mandrake) - VENDORSED='-e s,^@mandrake@,,' - RPMRC_OPTFLAGS="`echo $RPMRC_OPTFLAGS | sed -e s/i386/i686/`" - ;; - conectiva) - VENDORSED='-e s,^@conectiva@,,' - ;; - redhat) - VENDORSED='-e s,^@redhat@,,' - ;; - apple) - VENDORSED='-e s,^@apple@,,' - ;; - esac - CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`" cat $PLATFORM \ @@ -142,7 +119,7 @@ for SUBST in $SUBSTS ; do -e '/\${\w*:-/!s,\${,%{_,' \ -e "s,@ISANAME@,$ISANAME," \ -e "s,@ISABITS@,$ISABITS," \ - $VENDORSED \ + -e "s,^@${VENDOR}@,," \ | grep -v '^@' \ > ${PPD}/macros |