From commits-return-46529-apmail-subversion-commits-archive=subversion.apache.org@subversion.apache.org Fri Feb 3 11:51:25 2017 Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1D911199F6 for ; Fri, 3 Feb 2017 11:51:25 +0000 (UTC) Received: (qmail 94413 invoked by uid 500); 3 Feb 2017 11:51:25 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 94377 invoked by uid 500); 3 Feb 2017 11:51:25 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 94367 invoked by uid 99); 3 Feb 2017 11:51:24 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2017 11:51:24 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 381E23A0ABA for ; Fri, 3 Feb 2017 11:51:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1781544 - /subversion/trunk/tools/dev/unix-build/Makefile.svn Date: Fri, 03 Feb 2017 11:51:23 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170203115124.381E23A0ABA@svn01-us-west.apache.org> 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 $@