Changeset 2075 for trunk/base

Timestamp:

Feb 25, 2003, 8:31:23 AM (21 years ago)

Author:

kevin

Message:

Populate ${destroot} with prefix.mtree and macosx.mtree, then prune when done.

Location:

trunk/base

Files:

• doc/Makefile (modified) (1 diff)
• src/port1.0/portinstall.tcl (modified) (2 diffs)

trunk/base/doc/Makefile

@@ -23 +23 @@
         fi
         install -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${DESTDIR}${ETCDIR}
+        mkdir -p ${INSTALLDIR}/share/darwinports/resources/port1.0/install
         install -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/darwinports/resources/port1.0/install/
         install -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/darwinports/resources/port1.0/install/

trunk/base/src/port1.0/portinstall.tcl

@@ -56 +56 @@
 
 proc install_start {args} {
-    global UI_PREFIX portname destroot
+    global UI_PREFIX prefix portname destroot portresourcepath
 
     ui_msg "$UI_PREFIX [format [msgcat::mc "Installing %s"] ${portname}]"
         
-        file mkdir ${destroot}
+        file mkdir "${destroot}"
+        system "cd ${destroot} && mtree -d -e -U -f ${portresourcepath}/install/macosx.mtree"
+        file mkdir "${destroot}/${prefix}"
+        system "cd \"${destroot}/${prefix}\" && mtree -d -e -U -f ${portresourcepath}/install/prefix.mtree"
 }
 
@@ -132 +135 @@
     global portname portversion portpath categories description long_description homepage depends_run installPlist package-install uninstall workdir worksrcdir prefix UI_PREFIX destroot
 
+        # Prune empty directories in ${destroot}
+        catch {system "find \"${destroot}\" -depth -type d -print | xargs rmdir"}
+
     # Install ${destroot} contents into /
     directory_dig ${destroot} ${destroot}