From: Takashi Sato <takashi@apache.org>
Date: Fri, 9 Oct 2009 16:57:20 +0000 (+0000)
Subject: Build: Use install instead of cp if available on
X-Git-Tag: 2.3.3~181
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7d38360aa945e972945e03aa708918e76ec6f24;p=apache

Build: Use install instead of cp if available on
installing modules to avoid segfault.

Submitted by: <hirose31 gmail.com>
PR: 47951

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

diff --git a/CHANGES b/CHANGES
index bab6290cba..71068f7325 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,9 @@ Changes with Apache 2.3.3
      mod_proxy_ftp: NULL pointer dereference on error paths.
      [Stefan Fritsch <sf fritsch.de>, Joe Orton]
 
+  *) Build: Use install instead of cp if available on installing
+     modules to avoid segmentation fault.  [hirose31 gmail.com]
+
   *) mod_cache: correctly consider s-maxage in cacheability
      decisions.  [Dan Poirier]
 
diff --git a/build/instdso.sh b/build/instdso.sh
index 7716b29898..e6c370438b 100755
--- a/build/instdso.sh
+++ b/build/instdso.sh
@@ -49,7 +49,8 @@ then
     $CMD || exit $?
 fi
 
-CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/"
+type install >/dev/null 2>&1 && INSTALL_CMD=install || INSTALL_CMD=cp
+CMD="$SH_LIBTOOL --mode=install $INSTALL_CMD $DSOARCHIVE $TARGETDIR/"
 echo $CMD
 $CMD || exit $?