]> granicus.if.org Git - apache/commitdiff
Build: Use install instead of cp if available on
authorTakashi Sato <takashi@apache.org>
Fri, 9 Oct 2009 16:57:20 +0000 (16:57 +0000)
committerTakashi Sato <takashi@apache.org>
Fri, 9 Oct 2009 16:57:20 +0000 (16:57 +0000)
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

CHANGES
build/instdso.sh

diff --git a/CHANGES b/CHANGES
index bab6290cba4da3ee74ba9a83f56e771f8ec837ca..71068f7325e05b4342562c3ad4ed6cb31b0a5899 100644 (file)
--- 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]
 
index 7716b2989867104307e6d425c24e7bf3918439dd..e6c370438b9523f7eb82733568d1481133ae09f7 100755 (executable)
@@ -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 $?