take over DSO installation from libtool on all platforms, for both

"make install" and "apxs -i"

since we don't link with Apache DSOs we don't need the .la files

since we load Apache DSOs with explicit path information we don't
need any other system-specific magic to be performed

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

diff --git a/build/instdso.sh b/build/instdso.sh
index c7b5d61564876dd8ea65daf188493116bffe3651..fb995507d5a53fb54d142914d34160766d29f7cd 100755 (executable)
--- a/build/instdso.sh
+++ b/build/instdso.sh
@@ -2,9 +2,11 @@
 #
 # instdso.sh - install Apache DSO modules
 #
-# usually this just passes through to libtool but on a few
-# platforms libtool doesn't install DSOs exactly like we'd
-# want so more effort is required
+# we use this instead of libtool --install because:
+# 1) on a few platforms libtool doesn't install DSOs exactly like we'd
+#    want (weird names, doesn't remove DSO first)
+# 2) we never want the .la files copied, so we might as well copy
+#    the .so files ourselves
 
 if test "$#" != "3"; then
     echo "wrong number of arguments to instdso.sh"
@@ -18,9 +20,6 @@ TARGETDIR=$3
 DSOBASE=`echo $DSOARCHIVE | sed -e 's/\.la$//'`
 TARGET_NAME="$DSOBASE.so"
 
-# special logic for systems where libtool doesn't install
-# the DSO exactly like we'd want
-
 SYS=`uname -s`
 case $SYS in
     AIX)
@@ -45,7 +44,7 @@ case $SYS in
         $CMD || exit $?
         ;;
     *)
-        CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR"
+        CMD="cp .libs/$TARGET_NAME $TARGETDIR/$TARGET_NAME"
         echo $CMD
         $CMD || exit $?
         ;;