jerenkrantz 2003/03/22 19:32:57
Modified: . apu-config.in CHANGES
Log:
Fix error in apu-config when symlinks are involved.
Submitted by: Garrett Rooney <[EMAIL PROTECTED]>
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.31 +8 -5 apr-util/apu-config.in
Index: apu-config.in
===================================================================
RCS file: /home/cvs/apr-util/apu-config.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -u -r1.30 -r1.31
--- apu-config.in 22 Feb 2003 09:11:17 -0000 1.30
+++ apu-config.in 23 Mar 2003 03:32:57 -0000 1.31
@@ -111,16 +111,19 @@
thisdir="`dirname $0`"
thisdir="`cd $thisdir && pwd`"
+if test -d $bindir; then
+ tmpbindir="`cd $bindir && pwd`"
+else
+ tmpbindir=""
+fi
# If we have the realpath program, use it to resolve symlinks.
# Otherwise, being in a symlinked dir may result in incorrect output.
if test -x "`which realpath 2>/dev/null`"; then
thisdir="`realpath $thisdir`"
APU_SOURCE_DIR="`realpath $APU_SOURCE_DIR`"
-fi
-if test -d $bindir; then
- tmpbindir="`cd $bindir && pwd`"
-else
- tmpbindir=""
+ if test -n $tmpbindir; then
+ tmpbindir="`realpath $tmpbindir`"
+ fi
fi
if test "$tmpbindir" = "$thisdir"; then
location=installed
1.105 +2 -1 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -u -r1.104 -r1.105
--- CHANGES 22 Mar 2003 03:23:43 -0000 1.104
+++ CHANGES 23 Mar 2003 03:32:57 -0000 1.105
@@ -1,6 +1,7 @@
Changes with APR-util 0.9.3
-
+ *) Fix error in apu-config when symlinks are involved.
+ [Garrett Rooney <[EMAIL PROTECTED]>]
Changes with APR-util 0.9.2
