You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by jo...@apache.org on 2005/06/08 17:37:55 UTC

svn commit: r189595 - /httpd/httpd/trunk/build/instdso.sh

Author: jorton
Date: Wed Jun  8 08:37:55 2005
New Revision: 189595

URL: http://svn.apache.org/viewcvs?rev=189595&view=rev
Log:
* build/instdso.sh: Extract LIBRARY_NAMES and DLNAME without using
grep; fix extraction of LIBRARY_NAMES which was sedding the wrong
variable name.

Modified:
    httpd/httpd/trunk/build/instdso.sh

Modified: httpd/httpd/trunk/build/instdso.sh
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/instdso.sh?rev=189595&r1=189594&r2=189595&view=diff
==============================================================================
--- httpd/httpd/trunk/build/instdso.sh (original)
+++ httpd/httpd/trunk/build/instdso.sh Wed Jun  8 08:37:55 2005
@@ -61,8 +61,8 @@
     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"