You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pe...@apache.org on 2010/11/19 18:29:56 UTC
svn commit: r1036957 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Author: peters
Date: Fri Nov 19 17:29:55 2010
New Revision: 1036957
URL: http://svn.apache.org/viewvc?rev=1036957&view=rev
Log:
Followup r1036927 for more portability.
* tools/dev/unix-build/Makefile.svn
($(NEON_OBJDIR)/.configured, $(SVN_OBJDIR)/.retrieved):
While we're concerned about shell portability, stop using '-a' in
test, which last I heard wasn't POSIX. Instead use [ ] && [ ].
Modified:
subversion/trunk/tools/dev/unix-build/Makefile.svn
Modified: subversion/trunk/tools/dev/unix-build/Makefile.svn
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/dev/unix-build/Makefile.svn?rev=1036957&r1=1036956&r2=1036957&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Fri Nov 19 17:29:55 2010
@@ -548,7 +548,7 @@ endif
# configure neon
$(NEON_OBJDIR)/.configured: $(NEON_OBJDIR)/.retrieved
cd $(NEON_SRCDIR) && ./autogen.sh
- if [ -n "$(KRB5_CONFIG_PATH)" -a -d "$(KRB5_CONFIG_PATH)" ]; then \
+ if [ -n "$(KRB5_CONFIG_PATH)" ] && [ -d "$(KRB5_CONFIG_PATH)" ]; then \
cp $(KRB5_CONFIG_PATH)/krb5-config $(NEON_OBJDIR); \
chmod +x $(NEON_OBJDIR)/krb5-config; \
fi
@@ -801,7 +801,7 @@ $(SVN_OBJDIR)/.retrieved:
branchdir="$(BRANCH)"; \
co="co"; \
fi; \
- if [ ! -d $(SVN_WC) -a ! -h $(SVN_WC) ]; then \
+ if [ ! -d $(SVN_WC) ] && [ ! -h $(SVN_WC) ]; then \
svn $${co} $(SUBVERSION_REPOS_URL)/$${branchdir} \
$(SVN_WC); \
fi