From: Joe Orton Date: Wed, 8 Jun 2005 15:37:55 +0000 (+0000) Subject: * build/instdso.sh: Extract LIBRARY_NAMES and DLNAME without using X-Git-Tag: 2.1.5~34 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32ed21c04497a215b1c4b205de28e9fa61525d4f;p=apache * build/instdso.sh: Extract LIBRARY_NAMES and DLNAME without using grep; fix extraction of LIBRARY_NAMES which was sedding the wrong variable name. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@189595 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/build/instdso.sh b/build/instdso.sh index c3e1b76df9..068419ad9d 100755 --- a/build/instdso.sh +++ b/build/instdso.sh @@ -61,8 +61,8 @@ then exit 0 fi -DLNAME=`grep "^dlname" $TARGETDIR/$DSOARCHIVE_BASENAME | sed -e "s/dlname='\([^']*\)'/\1/"` -LIBRARY_NAMES=`grep "library_names" $TARGETDIR/$DSOARCHIVE_BASENAME | sed -e "s/dlname='\([^']*\)'/\1/"` +DLNAME=`sed -n "/^dlname=/{s/.*='\([^']*\)'/\1/;p}" $TARGETDIR/$DSOARCHIVE_BASENAME` +LIBRARY_NAMES=`sed -n "/^library_names/{s/library_names='\([^']*\)'/\1/;p}" $TARGETDIR/$DSOARCHIVE_BASENAME` LIBRARY_NAMES=`echo $LIBRARY_NAMES | sed -e "s/ *$DLNAME//g"` if test -z "$DLNAME"