httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/build instdso.sh
Date Fri, 14 Dec 2001 12:29:38 GMT
trawick     01/12/14 04:29:37

  Modified:    build    instdso.sh
  Log:
  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
  
  Revision  Changes    Path
  1.2       +6 -7      httpd-2.0/build/instdso.sh
  
  Index: instdso.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/instdso.sh,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- instdso.sh	2001/12/07 17:48:36	1.1
  +++ instdso.sh	2001/12/14 12:29:37	1.2
  @@ -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 @@
   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 @@
           $CMD || exit $?
           ;;
       *)
  -        CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR"
  +        CMD="cp .libs/$TARGET_NAME $TARGETDIR/$TARGET_NAME"
           echo $CMD
           $CMD || exit $?
           ;;
  
  
  

Mime
View raw message