diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2002-06-02 08:54:04 +0000 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2002-06-02 08:54:04 +0000 |
| commit | 42a29abb543d04aeec857ea5e6a37fbf528b768f (patch) | |
| tree | 6fa7e6f3c3800a521a642e03ed884f35ec176dfe /build/instdso.sh | |
| parent | 26188927a2e31ec83de6d151f400007f0ba6d1d6 (diff) | |
| download | httpd-42a29abb543d04aeec857ea5e6a37fbf528b768f.tar.gz | |
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
Diffstat (limited to 'build/instdso.sh')
| -rwxr-xr-x | build/instdso.sh | 9 |
1 files changed, 5 insertions, 4 deletions
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 |