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 2006/03/31 14:28:55 UTC
svn commit: r390406 - in /httpd/httpd/branches/2.2.x: CHANGES
build/instdso.sh
Author: jorton
Date: Fri Mar 31 04:28:52 2006
New Revision: 390406
URL: http://svn.apache.org/viewcvs?rev=390406&view=rev
Log:
Merge r389797 from trunk:
* build/instdso.sh: Fix syntax error with some sed implementations.
PR: 38108
Submitted by: Masaoki Kobayashi <masaoki techfirm.co.jp>
Reviewed by: jorton, rpluem, pquerna
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/build/instdso.sh
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=390406&r1=390405&r2=390406&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri Mar 31 04:28:52 2006
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.1
+ *) Fix instdso.sh "sed syntax error" installation issue on some
+ platforms. PR 38108. [Masaoki Kobayashi <masaoki techfirm.co.jp>]
+
*) mod_ssl: Fix possible crashes in shmcb with gcc 4 on platforms
requiring word-aligned pointers. PR 38838. [Joe Orton]
Modified: httpd/httpd/branches/2.2.x/build/instdso.sh
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/build/instdso.sh?rev=390406&r1=390405&r2=390406&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/build/instdso.sh (original)
+++ httpd/httpd/branches/2.2.x/build/instdso.sh Fri Mar 31 04:28:52 2006
@@ -61,8 +61,8 @@
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`
+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"