Changeset 40803


Ignore:
Timestamp:
Oct 15, 2008, 10:17:48 AM (12 years ago)
Author:
jmr@…
Message:

Move default frameworks_dir under prefix, and use it in portgroups

Location:
trunk/base
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/aclocal.m4

    r40060 r40803  
    389389
    390390        if test "x$MPFRAMEWORKSDIR" = "x" ; then
    391             if test "$DSTUSR" = "root" ; then
    392                 MPFRAMEWORKSDIR="/Library/Frameworks"
    393             else
    394                 MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
    395             fi
     391                MPFRAMEWORKSDIR="${prefix}/Library/Frameworks"
    396392        fi
    397393
  • trunk/base/configure

    r40060 r40803  
    68496849
    68506850        if test "x$MPFRAMEWORKSDIR" = "x" ; then
    6851             if test "$DSTUSR" = "root" ; then
    6852                 MPFRAMEWORKSDIR="/Library/Frameworks"
    6853             else
    6854                 MPFRAMEWORKSDIR="~$DSTUSR/Library/Frameworks"
    6855             fi
     6851                MPFRAMEWORKSDIR="${prefix}/Library/Frameworks"
    68566852        fi
    68576853
  • trunk/base/doc/macports.conf.5

    r34360 r40803  
    9797.br
    9898.Ic Default:
    99 /Library/Frameworks
     99${prefix}/Library/Frameworks
    100100.It Va sources_conf
    101101Location of the sources file. This file enables rsync synchronization of the default ports tree with the
  • trunk/base/doc/portgroup.7

    r28465 r40803  
    143143.br
    144144.Sy Default:
    145 .Em /Library/Frameworks
     145.Em ${prefix}/Library/Frameworks
    146146or
    147 .Em /Application/MacPorts depending on xcode.destroot.type
     147.Em /Applications/MacPorts depending on xcode.destroot.type
    148148.br
    149149.It Ic xcode.destroot.settings
  • trunk/base/doc/porthier.7

    r27889 r40803  
    5454.It Pa libexec/
    5555system daemons & system utilities (executed by other programs)
     56.It Pa Library/Frameworks/
     57Native Mac OS X Library Frameworks
    5658.It Pa sbin/
    5759system programs and administration utilities
     
    128130.It Pa /Applications/MacPorts/
    129131Native Mac OS X applications
    130 .It Pa /Library/Frameworks/
    131 Native Mac OS X Library Frameworks
    132132.Pp
    133133.El
  • trunk/base/src/macports1.0/macports.tcl

    r40712 r40803  
    10621062        lappend search_path $env(DYLD_FRAMEWORK_PATH)
    10631063    } else {
    1064         lappend search_path /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks
     1064        lappend search_path ${frameworks_dir} /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks
    10651065    }
    10661066    if {[info exists env(DYLD_FALLBACK_FRAMEWORK_PATH)]} {
     
    10701070        lappend search_path $env(DYLD_LIBRARY_PATH)
    10711071    }
    1072     lappend search_path /lib /usr/lib /usr/X11R6/lib /usr/X11/lib ${prefix}/lib
     1072    lappend search_path /lib /usr/lib ${x11prefix}/lib ${prefix}/lib
    10731073    if {[info exists env(DYLD_FALLBACK_LIBRARY_PATH)]} {
    10741074        lappend search_path $env(DYLD_FALLBACK_LIBRARY_PATH)
  • trunk/base/src/port1.0/portmain.tcl

    r36764 r40803  
    6161default x11prefix /usr/X11R6
    6262default applications_dir /Applications/MacPorts
    63 default frameworks_dir /Library/Frameworks
     63default frameworks_dir {${prefix}/Library/Frameworks}
    6464default destdir destroot
    6565default destpath {${workpath}/${destdir}}
  • trunk/base/src/port1.0/resources/group/python24-1.0.tcl

    r37336 r40803  
    3535set python.bin  ${prefix}/bin/python2.4
    3636set python.lib  ${prefix}/lib/libpython2.4.dylib
    37 set python.libdir ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/lib/python2.4
     37set python.libdir ${frameworks_dir}/Python.framework/Versions/2.4/lib/python2.4
    3838set python.pkgd ${prefix}/lib/python2.4/site-packages
    39 set python.include      ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/include/python2.4
     39set python.include      ${frameworks_dir}/Python.framework/Versions/2.4/include/python2.4
    4040
    4141categories              python
  • trunk/base/src/port1.0/resources/group/python30-1.0.tcl

    r37336 r40803  
    3333#
    3434
    35 set prefix ${prefix}/Library/Frameworks/Python.framework/Versions/3.0
     35set prefix ${frameworks_dir}/Python.framework/Versions/3.0
    3636
    3737set python.bin  ${prefix}/bin/python3.0
Note: See TracChangeset for help on using the changeset viewer.