From ad0da75a0d6c0bd7f32133bc5cd05636ae470257 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 25 Mar 2011 13:22:53 +0200 Subject: [PATCH] Simplify the hysterical per-platform vendor-sed thing --- installplatform | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/installplatform b/installplatform index 5973a18..853c721 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 -- 2.7.4