]> granicus.if.org Git - apache/commitdiff
Remove install errors emitted when using jlibtool instead of GNU libtool.
authorJustin Erenkrantz <jerenkrantz@apache.org>
Wed, 28 Sep 2005 03:42:44 +0000 (03:42 +0000)
committerJustin Erenkrantz <jerenkrantz@apache.org>
Wed, 28 Sep 2005 03:42:44 +0000 (03:42 +0000)
(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.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@292109 13f79535-47bb-0310-9956-ffa450edef68

build/instdso.sh

index 068419ad9d6faba1b566ee6b557c954b1460b29d..0b2ab00da00589b36c19b9fc1f31df895cc48fca 100755 (executable)
@@ -61,9 +61,12 @@ then
     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