httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/build instdso.sh
Date Sun, 02 Jun 2002 08:54:05 GMT
jerenkrantz    2002/06/02 01:54:04

  Modified:    .        CHANGES
               build    instdso.sh
  Log:
  Use the basename of the dso file rather than assuming it does not include
  a directory in it.
  
  Revision  Changes    Path
  1.805     +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.804
  retrieving revision 1.805
  diff -u -r1.804 -r1.805
  --- CHANGES	31 May 2002 17:23:26 -0000	1.804
  +++ CHANGES	2 Jun 2002 08:54:04 -0000	1.805
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.37
   
  +  *) Allow instdso.sh to work with full paths to the shared module.
  +     [Justin Erenkrantz]
  +
     *) NetWare: Enabled CGI functionality and added mod_cgi as a built
        in module for NetWare  [Brad Nicholes]
   
  
  
  
  1.6       +5 -4      httpd-2.0/build/instdso.sh
  
  Index: instdso.sh
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/build/instdso.sh,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- instdso.sh	19 Apr 2002 14:04:30 -0000	1.5
  +++ instdso.sh	2 Jun 2002 08:54:04 -0000	1.6
  @@ -16,8 +16,9 @@
   
   SH_LIBTOOL=`echo $1 | sed -e 's/^SH_LIBTOOL=//'`
   DSOARCHIVE=$2
  +DSOARCHIVE_BASENAME=`basename $2`
   TARGETDIR=$3
  -DSOBASE=`echo $DSOARCHIVE | sed -e 's/\.la$//'`
  +DSOBASE=`echo $DSOARCHIVE_BASENAME | sed -e 's/\.la$//'`
   TARGET_NAME="$DSOBASE.so"
   
   SYS=`uname -s`
  @@ -36,8 +37,8 @@
   echo $CMD
   $CMD || exit $?
   
  -DLNAME=`grep "^dlname" $TARGETDIR/$DSOARCHIVE | sed -e "s/dlname='\([^']*\)'/\1/"`
  -LIBRARY_NAMES=`grep "library_names" $TARGETDIR/$DSOARCHIVE | sed -e "s/dlname='\([^']*\)'/\1/"`
  +DLNAME=`grep "^dlname" $TARGETDIR/$DSOARCHIVE_BASENAME | sed -e "s/dlname='\([^']*\)'/\1/"`
  +LIBRARY_NAMES=`grep "library_names" $TARGETDIR/$DSOARCHIVE_BASENAME | sed -e "s/dlname='\([^']*\)'/\1/"`
   LIBRARY_NAMES=`echo $LIBRARY_NAMES | sed -e "s/ *$DLNAME//g"`
   
   if test -n "$LIBRARY_NAMES"
  @@ -53,7 +54,7 @@
       mv $TARGETDIR/$DLNAME $TARGETDIR/$TARGET_NAME
   fi
   
  -rm -f $TARGETDIR/$DSOARCHIVE
  +rm -f $TARGETDIR/$DSOARCHIVE_BASENAME
   rm -f $TARGETDIR/$DSOBASE.a
   rm -f $TARGETDIR/lib$DSOBASE.a
   rm -f $TARGETDIR/lib$TARGET_NAME
  
  
  

Mime
View raw message