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

[cal at macports.org]

Revision: 91744
          https://trac.macports.org/changeset/91744
Author:   cal at macports.org
Date:     2012-04-09 06:44:40 -0700 (Mon, 09 Apr 2012)
Log Message:
-----------
Fix regression introduced by r90650 adding "-w" to destroot.cmd if build.cmd is gmake

Also adds a test for this problem, closes #33943.

Revision Links:
--------------
    https://trac.macports.org/changeset/90650

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

Modified: trunk/base/src/port1.0/Makefile
===================================================================
--- trunk/base/src/port1.0/Makefile	2012-04-09 12:42:48 UTC (rev 91743)
+++ trunk/base/src/port1.0/Makefile	2012-04-09 13:44:40 UTC (rev 91744)
@@ -33,3 +33,4 @@
 
 test::
 	${TCLSH} tests/portutil.tcl ${macports_tcl_dir}
+	${TCLSH} tests/portdestroot.tcl

Modified: trunk/base/src/port1.0/portdestroot.tcl
===================================================================
--- trunk/base/src/port1.0/portdestroot.tcl	2012-04-09 12:42:48 UTC (rev 91743)
+++ trunk/base/src/port1.0/portdestroot.tcl	2012-04-09 13:44:40 UTC (rev 91744)
@@ -92,7 +92,7 @@
 proc portdestroot::destroot_getargs {args} {
     if {(([option build.type] == "default" && [option os.platform] != "freebsd") || \
          ([option build.type] == "gnu")) \
-        && [regexp "^(/\\S+/|)(g|gnu|)make(\\s+.*|)$" [option build.cmd]]} {
+        && [regexp "^(/\\S+/|)(g|gnu|)make(\\s+.*|)$" [option destroot.cmd]]} {
         # Print "Entering directory" lines for better log debugging
         return "-w [option destroot.target]"
     }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120409/5e966ae4/attachment-0001.html>