httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject svn commit: r292109 - /httpd/httpd/trunk/build/instdso.sh
Date Wed, 28 Sep 2005 03:42:45 GMT
Author: jerenkrantz
Date: Tue Sep 27 20:42:44 2005
New Revision: 292109

URL: http://svn.apache.org/viewcvs?rev=292109&view=rev
Log:
Remove install errors emitted when using jlibtool instead of GNU libtool.

(grep would skip this silently; but sed emits errors when no match is found.)

* build/instdso.sh: Protect sed calls with a test -s check to make sure
  that we're going to execute sed against a non-empty file.

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=292109&r1=292108&r2=292109&view=diff
==============================================================================
--- httpd/httpd/trunk/build/instdso.sh (original)
+++ httpd/httpd/trunk/build/instdso.sh Tue Sep 27 20:42:44 2005
@@ -61,9 +61,12 @@
     exit 0
 fi
 
-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 -s "$TARGETDIR/$DSOARCHIVE_BASENAME"
+then
+  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"`
+fi
 
 if test -z "$DLNAME"
 then



Mime
View raw message