Changeset 80223

Timestamp:

07/07/11 00:32:15 (4 years ago)

Author:

jmr@…

Message:

merge r80222 from trunk:

apparently bash needs an extra eval to expand both a variable and a tilde

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/aclocal.m4 (modified) (2 diffs)
• base/configure (modified) (2 diffs)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/aclocal.m4

@@ -336 +336 @@
                 # Set Tcl package directory to ~/Library/Tcl
             AC_MSG_CHECKING(for Tcl package directory)
-                ac_cv_c_tclpkgd=`echo ~$DSTUSR/Library/Tcl`
+                ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
             # Convert to a native path and substitute into the output files.
             PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}`
@@ -647 +647 @@
                             fi
                         elif test "$path" = "~/Library/Tcl"; then
-                            ac_cv_c_tclpkgd=`echo ~$DSTUSR/Library/Tcl`
+                            ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
                             break
                         fi

branches/release_2_0/base/configure

@@ -7743 +7743 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl package directory" >&5
 $as_echo_n "checking for Tcl package directory... " >&6; }
-                ac_cv_c_tclpkgd=`echo ~$DSTUSR/Library/Tcl`
+                ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
             # Convert to a native path and substitute into the output files.
             PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}`
@@ -9206 +9206 @@
                             fi
                         elif test "$path" = "~/Library/Tcl"; then
-                            ac_cv_c_tclpkgd=`echo ~$DSTUSR/Library/Tcl`
+                            ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
                             break
                         fi