[62695] trunk/base/src/port1.0

[ryandesign at macports.org]

Revision: 62695
          http://trac.macports.org/changeset/62695
Author:   ryandesign at macports.org
Date:     2010-01-13 16:07:51 -0800 (Wed, 13 Jan 2010)
Log Message:
-----------
No need for a slash before prefix, applications_dir or frameworks_dir; they all start with a slash already

Modified Paths:
--------------
    trunk/base/src/port1.0/portdestroot.tcl
    trunk/base/src/port1.0/portstartupitem.tcl

Modified: trunk/base/src/port1.0/portdestroot.tcl
===================================================================
--- trunk/base/src/port1.0/portdestroot.tcl	2010-01-13 23:54:49 UTC (rev 62694)
+++ trunk/base/src/port1.0/portdestroot.tcl	2010-01-14 00:07:51 UTC (rev 62695)
@@ -121,11 +121,11 @@
     file mkdir "${destroot}"
     if { ${os.platform} == "darwin" } {
         system "cd \"${destroot}\" && ${mtree} -e -U -f [file join ${portsharepath} install macosx.mtree]"
-        file mkdir "${destroot}/${applications_dir}"
-        file mkdir "${destroot}/${frameworks_dir}"
+        file mkdir "${destroot}${applications_dir}"
+        file mkdir "${destroot}${frameworks_dir}"
     }
-    file mkdir "${destroot}/${prefix}"
-    system "cd \"${destroot}/${prefix}\" && ${mtree} -e -U -f [file join ${portsharepath} install prefix.mtree]"
+    file mkdir "${destroot}${prefix}"
+    system "cd \"${destroot}${prefix}\" && ${mtree} -e -U -f [file join ${portsharepath} install prefix.mtree]"
 }
 
 proc portdestroot::destroot_main {args} {

Modified: trunk/base/src/port1.0/portstartupitem.tcl
===================================================================
--- trunk/base/src/port1.0/portstartupitem.tcl	2010-01-13 23:54:49 UTC (rev 62694)
+++ trunk/base/src/port1.0/portstartupitem.tcl	2010-01-14 00:07:51 UTC (rev 62695)
@@ -79,7 +79,7 @@
     global startupitem.start startupitem.stop startupitem.restart
     global startupitem.type
 
-    set scriptdir ${destroot}/${prefix}/etc/rc.d
+    set scriptdir ${destroot}${prefix}/etc/rc.d
 
     if { ![exists startupitem.requires] } {
         set startupitem.requires ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100113/718888a7/attachment.html>