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
