changeset 934:0ff0275f3388

Merge
author asaha
date Thu, 16 Jan 2014 21:43:13 -0800
parents 131a0f8deafa 690bb11e1df2
children 135f0c7af57e 56c1a2adf6c4
files common/autoconf/generated-configure.sh
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/jdk-options.m4	Wed Jan 15 14:19:11 2014 -0800
+++ b/common/autoconf/jdk-options.m4	Thu Jan 16 21:43:13 2014 -0800
@@ -105,7 +105,7 @@
   fi
 
   # Replace the commas with AND for use in the build directory name.
-  ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
+  ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'`
   COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/'`
   if test "x$COUNT_VARIANTS" != "x,1"; then
     BUILDING_MULTIPLE_JVM_VARIANTS=yes