[48232] branches/release_1_7/base

[raimue at macports.org]

Revision: 48232
          http://trac.macports.org/changeset/48232
Author:   raimue at macports.org
Date:     2009-03-17 01:12:13 -0700 (Tue, 17 Mar 2009)
Log Message:
-----------
Merge r48083 from trunk:
base/aclocal.m4, base/configure:
Do expansion on ~ when looking for the home directory of a user.

Modified Paths:
--------------
    branches/release_1_7/base/aclocal.m4
    branches/release_1_7/base/configure

Property Changed:
----------------
    branches/release_1_7/base/


Property changes on: branches/release_1_7/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46810,46983,47034,47776,47782,47848,48230
/trunk/base/base:45161
   + /trunk/base:42683,42697,42734,42747,42760,42845-42847,42865,42962,42978,43001,43080,43083,43097,43140,43153,43194,43216-43217,43229,43704-43705,43733,43946,43954,43960,44363,45161,45201,46146,46622-46623,46810,46983,47034,47776,47782,47848,48083,48230
/trunk/base/base:45161,48083

Modified: branches/release_1_7/base/aclocal.m4
===================================================================
--- branches/release_1_7/base/aclocal.m4	2009-03-17 07:54:30 UTC (rev 48231)
+++ branches/release_1_7/base/aclocal.m4	2009-03-17 08:12:13 UTC (rev 48232)
@@ -374,7 +374,7 @@
 	    if test "$DSTUSR" = "root" ; then
 		MPAPPLICATIONSDIR="/Applications/MacPorts"
 	    else
-		MPAPPLICATIONSDIR="~$DSTUSR/Applications/MacPorts"
+		MPAPPLICATIONSDIR="$(eval echo ~$DSTUSR)/Applications/MacPorts"
 	    fi
 	fi
 

Modified: branches/release_1_7/base/configure
===================================================================
--- branches/release_1_7/base/configure	2009-03-17 07:54:30 UTC (rev 48231)
+++ branches/release_1_7/base/configure	2009-03-17 08:12:13 UTC (rev 48232)
@@ -6859,7 +6859,7 @@
 	    if test "$DSTUSR" = "root" ; then
 		MPAPPLICATIONSDIR="/Applications/MacPorts"
 	    else
-		MPAPPLICATIONSDIR="~$DSTUSR/Applications/MacPorts"
+		MPAPPLICATIONSDIR="$(eval echo ~$DSTUSR)/Applications/MacPorts"
 	    fi
 	fi
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090317/1745de71/attachment.html>