From 42a29abb543d04aeec857ea5e6a37fbf528b768f Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Sun, 2 Jun 2002 08:54:04 +0000 Subject: [PATCH] Use the basename of the dso file rather than assuming it does not include a directory in it. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95466 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ build/instdso.sh | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index c19b61a9a8..ed58d107dc 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/build/instdso.sh b/build/instdso.sh index 09e5c5f0cd..eb0945fa10 100755 --- a/build/instdso.sh +++ b/build/instdso.sh @@ -16,8 +16,9 @@ fi 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 @@ CMD="$SH_LIBTOOL --mode=install cp $DSOARCHIVE $TARGETDIR/" 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 @@ then 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 -- 2.50.1