Ignore:
Timestamp:
Mar 26, 2009, 4:55:52 AM (10 years ago)
Author:
mcalhoun@…
Message:

muniversal-1.0.tcl: Allow for more diversity of configure, build, and destroot directories.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/ncursesw/Portfile

    r47789 r48601  
    6464                                if { ${arch}=="i386" || ${arch}=="x86_64" || (${os.major} < 10 && ${arch}=="ppc") } {
    6565                                        if { ${os.major} >= 10 } {
    66                                                 set merger_destroot_env(ppc)     "DYLD_LIBRARY_PATH=${workpath}/${arch}/lib PATH=${workpath}/${arch}/progs:$env(PATH)"
     66                                                set merger_destroot_env(ppc)     "DYLD_LIBRARY_PATH=${worksrcpath}-${arch}/lib PATH=${worksrcpath}-${arch}/progs:$env(PATH)"
    6767                                        }
    68                                         set merger_destroot_env(ppc64)    "DYLD_LIBRARY_PATH=${workpath}/${arch}/lib PATH=${workpath}/${arch}/progs:$env(PATH)"
     68                                        set merger_destroot_env(ppc64)    "DYLD_LIBRARY_PATH=${worksrcpath}-${arch}/lib PATH=${worksrcpath}-${arch}/progs:$env(PATH)"
    6969                                        set have_run  "yes"
    7070                                        break
     
    8282                        foreach arch ${universal_archs_to_use} {
    8383                                if { ${arch}=="ppc" || ${arch}=="ppc64" } {
    84                                         set merger_destroot_env(i386)    "DYLD_LIBRARY_PATH=${workpath}/${arch}/lib PATH=${workpath}/${arch}/progs:$env(PATH)"
    85                                         set merger_destroot_env(x86_64)  "DYLD_LIBRARY_PATH=${workpath}/${arch}/lib PATH=${workpath}/${arch}/progs:$env(PATH)"
     84                                        set merger_destroot_env(i386)    "DYLD_LIBRARY_PATH=${worksrcpath}-${arch}/lib PATH=${worksrcpath}-${arch}/progs:$env(PATH)"
     85                                        set merger_destroot_env(x86_64)  "DYLD_LIBRARY_PATH=${worksrcpath}-${arch}/lib PATH=${worksrcpath}-${arch}/progs:$env(PATH)"
    8686                                        set have_run  "yes"
    8787                                        break
Note: See TracChangeset for help on using the changeset viewer.