[48083] trunk/base

[raimue at macports.org]

Revision: 48083
          http://trac.macports.org/changeset/48083
Author:   raimue at macports.org
Date:     2009-03-13 22:29:50 -0700 (Fri, 13 Mar 2009)
Log Message:
-----------
base/aclocal.m4, base/configure:
Do expansion on ~ when looking for the home directory of a user.

Most ports expect applications_dir to be an absolute path starting with a
slash. If this is not the case, constructs like ${destroot}${applications_dir}
will fail (work/destroot~foo/). This copies files outside the destroot so they
will not get installed.

Thanks to Kevin Reid (kpreid) for the report.

Modified Paths:
--------------
    trunk/base/aclocal.m4
    trunk/base/configure

Modified: trunk/base/aclocal.m4
===================================================================
--- trunk/base/aclocal.m4	2009-03-14 05:10:13 UTC (rev 48082)
+++ trunk/base/aclocal.m4	2009-03-14 05:29:50 UTC (rev 48083)
@@ -454,7 +454,7 @@
 	    if test "$DSTUSR" = "root" ; then
 		MPAPPLICATIONSDIR="/Applications/MacPorts"
 	    else
-		MPAPPLICATIONSDIR="~$DSTUSR/Applications/MacPorts"
+		MPAPPLICATIONSDIR="$(eval echo ~$DSTUSR)/Applications/MacPorts"
 	    fi
 	fi
 

Modified: trunk/base/configure
===================================================================
--- trunk/base/configure	2009-03-14 05:10:13 UTC (rev 48082)
+++ trunk/base/configure	2009-03-14 05:29:50 UTC (rev 48083)
@@ -7147,7 +7147,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/20090313/09daee1e/attachment.html>