Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-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 F371E92FD for ; Fri, 22 Jun 2012 09:26:50 +0000 (UTC) Received: (qmail 52166 invoked by uid 500); 22 Jun 2012 09:26:50 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 52063 invoked by uid 500); 22 Jun 2012 09:26:50 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 52041 invoked by uid 99); 22 Jun 2012 09:26:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jun 2012 09:26:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Jun 2012 09:26:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B1E3323889BF; Fri, 22 Jun 2012 09:26:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1352816 - in /incubator/ooo/trunk: ext_libraries/serf/makefile.mk main/scp2/source/ooo/file_library_ooo.scp Date: Fri, 22 Jun 2012 09:26:28 -0000 To: ooo-commits@incubator.apache.org From: jsc@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120622092628.B1E3323889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jsc Date: Fri Jun 22 09:26:27 2012 New Revision: 1352816 URL: http://svn.apache.org/viewvc?rev=1352816&view=rev Log: #120041# improve handling of serf version number Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Modified: incubator/ooo/trunk/ext_libraries/serf/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/serf/makefile.mk?rev=1352816&r1=1352815&r2=1352816&view=diff ============================================================================== --- incubator/ooo/trunk/ext_libraries/serf/makefile.mk (original) +++ incubator/ooo/trunk/ext_libraries/serf/makefile.mk Fri Jun 22 09:26:27 2012 @@ -105,6 +105,7 @@ OUT2INC_SUBDIR=serf .IF "$(OS)"=="MACOSX" OUT2LIB+=$(SERF_FIXED_LIB) +OUT2LIB+=.libs/libserf-1.*dylib .ELSE OUT2LIB=.libs/libserf-1.so* .ENDIF Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1352816&r1=1352815&r2=1352816&view=diff ============================================================================== --- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original) +++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri Jun 22 09:26:27 2012 @@ -2045,7 +2045,7 @@ File gid_File_Lib_Serf // Looks like the major version number is part of the name, not // part of the suffix. An error? #ifdef MACOSX - Name = STRING(CONCAT8(libserf-,SERF_MAJOR,.,SERF_MINOR,.,SERF_MICRO,.0,UNXSUFFIX)); + Name = STRING(CONCAT4(libserf-,SERF_MAJOR,.0.0.0,UNXSUFFIX)); #elif FREEBSD Name = STRING(CONCAT3(libserf-1,UNXSUFFIX,.0)); #else