Author: danielsh
Date: Mon Jul 29 03:44:00 2013
New Revision: 1507891
URL: http://svn.apache.org/r1507891
Log:
Followup to r1507889:
* Makefile.in
(APXS): Strip whitespace at the end of the definition, which propagates to
the value.
* subversion/tests/cmdline/davautocheck.sh
(APXS): Fix the sniffing from Makefile so that it works not only when
grep/sed failed, but also when they succeeded (by promoting the setting
of the parameter outside of a subshell).
Modified:
subversion/trunk/Makefile.in
subversion/trunk/subversion/tests/cmdline/davautocheck.sh
Modified: subversion/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1507891&r1=1507890&r2=1507891&view=diff
==============================================================================
--- subversion/trunk/Makefile.in (original)
+++ subversion/trunk/Makefile.in Mon Jul 29 03:44:00 2013
@@ -349,8 +349,8 @@ TEST_SHLIB_VAR_SWIG_RB=\
done; \
export @SVN_APR_SHLIB_PATH_VAR@; \
fi;
-
-APXS = @APXS@
+
+APXS = @APXS@
PYTHON = @PYTHON@
PERL = @PERL@
Modified: subversion/trunk/subversion/tests/cmdline/davautocheck.sh
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/davautocheck.sh?rev=1507891&r1=1507890&r2=1507891&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/davautocheck.sh (original)
+++ subversion/trunk/subversion/tests/cmdline/davautocheck.sh Mon Jul 29
03:44:00 2013
@@ -185,12 +185,18 @@ unset http_proxy
unset HTTPS_PROXY
# Pick up value from environment or PATH (also try apxs2 - for Debian)
-[ ${APXS:+set} ] \
- || (APXS=$(grep '^APXS' $ABS_BUILDDIR/Makefile | sed 's/^APXS *= *//') && \
- [ -n "$APXS" ]) \
- || APXS=$(which apxs) \
- || APXS=$(which apxs2) \
- || fail "neither apxs or apxs2 found - required to run davautocheck"
+if [ ${APXS:+set} ]; then
+ :
+elif APXS=$(grep '^APXS' $ABS_BUILDDIR/Makefile | sed 's/^APXS *= *//') && \
+ [ -n "$APXS" ]; then
+ :
+elif APXS=$(which apxs); then
+ :
+elif APXS=$(which apxs2); then
+ :
+else
+ fail "neither apxs or apxs2 found - required to run davautocheck"
+fi
[ -x $APXS ] || fail "Can't execute apxs executable $APXS"
