[143914] trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

[mcalhoun at macports.org]

Revision: 143914
          https://trac.macports.org/changeset/143914
Author:   mcalhoun at macports.org
Date:     2015-12-26 10:54:07 -0800 (Sat, 26 Dec 2015)
Log Message:
-----------
muniversal: allow autoconf to work correctly

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl

Modified: trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2015-12-26 18:35:38 UTC (rev 143913)
+++ trunk/dports/_resources/port1.0/group/muniversal-1.0.tcl	2015-12-26 18:54:07 UTC (rev 143914)
@@ -323,9 +323,22 @@
                 }
             }
 
+            set autoconf_dir_save  ${autoconf.dir}
+            if { [string match "${worksrcpath}/*" ${autoconf.dir}] } {
+                # The autoconf directory is inside the source directory, so put in the new source directory name.
+                option autoconf.dir [string map "${worksrcpath} ${worksrcpath}-${arch}" ${autoconf.dir}]
+            } else {
+                # The autoconf directory is outside the source directory, so give it a new name by appending ${arch}.
+                option autoconf.dir ${autoconf.dir}-${arch}
+                if { ![file exists ${autoconf.dir}] } {
+                    file mkdir ${autoconf.dir}
+                }
+            }
+
             portconfigure::configure_main
 
             # Undo changes to the configure related variables
+            option autoconf.dir         ${autoconf_dir_save}
             option autoreconf.dir       ${autoreconf_dir_save}
             option configure.dir        ${configure_dir_save}
             option configure.compiler   ${configure_compiler_save}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151226/725697d4/attachment.html>