subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1781544 - /subversion/trunk/tools/dev/unix-build/Makefile.svn
Date Fri, 03 Feb 2017 11:51:23 GMT
Author: stsp
Date: Fri Feb  3 11:51:23 2017
New Revision: 1781544

URL: http://svn.apache.org/viewvc?rev=1781544&view=rev
Log:
* tools/dev/unix-build/Makefile.svn: Merge serf ssl build fixes.

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=1781544&r1=1781543&r2=1781544&view=diff
==============================================================================
--- subversion/trunk/tools/dev/unix-build/Makefile.svn (original)
+++ subversion/trunk/tools/dev/unix-build/Makefile.svn Fri Feb  3 11:51:23 2017
@@ -821,7 +821,8 @@ serf-clean:
 $(SERF_OBJDIR)/.retrieved:
 	[ -d $(SERF_OBJDIR) ] || mkdir -p $(SERF_OBJDIR)
 	if [ ! -d $(SERF_SRCDIR) ]; then \
-		svn export $(SERF_URL) $(SERF_SRCDIR); \
+		svn co $(SERF_URL) $(SERF_SRCDIR); \
+		svn merge ^/serf/branches/1.3.x-sslbuild@1781542 $(SERF_SRCDIR); \
 	fi
 	touch $@
 



Mime
View raw message