From: Joe Orton <jorton@apache.org>
Date: Fri, 31 Mar 2006 12:28:52 +0000 (+0000)
Subject: Merge r389797 from trunk:
X-Git-Tag: 2.2.1~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99be4d87137cbed64aa280f270c0c2727c6c650d;p=thirdparty%2Fapache%2Fhttpd.git

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@390406 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index e8a8bcd1eea..460e03e6fe1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/build/instdso.sh b/build/instdso.sh
index 068419ad9d6..0bc280d5735 100755
--- a/build/instdso.sh
+++ b/build/instdso.sh
@@ -61,8 +61,8 @@ 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`
+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"