diff --git a/icu4c/source/config/icu-config-bottom b/icu4c/source/config/icu-config-bottom index 847ea396bc8..8679fc86730 100644 --- a/icu4c/source/config/icu-config-bottom +++ b/icu4c/source/config/icu-config-bottom @@ -1,5 +1,5 @@ ## -*-sh-*- -## BEGIN of icu-config-bottom. $Revision: 1.1 $ +## BEGIN of icu-config-bottom. $Revision: 1.2 $ ## Copyright (c) 2002, International Business Machines Corporation and ## others. All Rights Reserved. @@ -22,7 +22,7 @@ ICUUC_FILE=${libdir}/${ICULIBS_COMMON_LIB_NAME} # esac # echo ENABLE RPATH $ENABLE_RPATH and RPATHLDFLAGS=${RPATH_LDFLAGS} -if [ "x$PKGDATA_MODE" == "x" ]; then +if [ "x$PKGDATA_MODE" = "x" ]; then PKGDATA_MODE=dll fi @@ -205,7 +205,7 @@ do ;; --ldflags) - echo $ICULIBS $LIBS + echo $LDFLAGS $ICULIBS $LIBS # $RPATH_LDFLAGS ;; diff --git a/icu4c/source/config/make2sh.sed b/icu4c/source/config/make2sh.sed index 1da77004c5a..e21233dd09e 100644 --- a/icu4c/source/config/make2sh.sed +++ b/icu4c/source/config/make2sh.sed @@ -1,4 +1,5 @@ # Copyright (C) 1999-2002, International Business Machines Corporation and others. All Rights Reserved. +s%^\([a-zA-Z\.-]*\)[ ]*+=%\1=$(\1) % s%^[A-Z]*_SO_TARG*%## &% s%$(\([^\)]*\))%${\1}%g s%^ %#M# % @@ -7,7 +8,7 @@ s@^\([a-zA-Z][-.a-zA-Z_0-9-]*\)[ ]*=[ ]*\(.*\)@\1="\2"@ s@^\([a-zA-Z][-a-zA-Z_0-9-]*\)\.\([a-zA-Z_0-9-]*\)[ ]*=[ ]*\(.*\)@\1_\2=\3@ s@^\([a-zA-Z][-a-zA-Z_0-9-]*\)\-\([a-zA-Z_0-9-]*\)[ ]*=[ ]*\(.*\)@\1_\2=\3@ s@^\(prefix\)=\(.*\)@default_\1=\2\ -if [ "x${\1}" == "x" ]; then \1="$default_\1"; fi@ +if [ "x${\1}" = "x" ]; then \1="$default_\1"; fi@ s@^\(ENABLE_RPATH\)=\(.*\)@default_\1=\2\ -if [ "x${\1}" == "x" ]; then \1="$default_\1"; fi@ +if [ "x${\1}" = "x" ]; then \1="$default_\1"; fi@ s%^#SH#[ ]*%%