From: Ian Lynagh Date: Thu, 17 Dec 2009 00:04:21 +0000 (+0000) Subject: Fix another sed problem on Solaris X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=d9a2eefd17cd91e7193616d955056fddf3dab305;hp=d708100212551a1a4c3c05a7830c9092b4498e7c Fix another sed problem on Solaris --- diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index index 59f59dd..2ae6bf5 100644 --- a/libraries/gen_contents_index +++ b/libraries/gen_contents_index @@ -14,7 +14,9 @@ case $* in do LIBPATH=`echo "$HADDOCK_FILE" | sed 's#/dist-install.*##'` NAME=`echo "$HADDOCK_FILE" | sed 's#.*/##' | sed 's#\.haddock$##'` - VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*[[:space:]]//'` + # It's easier to portably remove tabs with tr and to try to get + # sed to do what we want + VERSION=`grep -i '^version:' $LIBPATH/$NAME.cabal | sed 's/.*://'` | tr -d ' \t' HADDOCK_ARG="--read-interface=${NAME}-${VERSION},$HADDOCK_FILE" HADDOCK_ARGS="$HADDOCK_ARGS $HADDOCK_ARG" done