Ticket #39456: patch-buildsystem.diff

File patch-buildsystem.diff, 2.0 KB (added by raimue (Rainer Müller), 7 years ago)
  • build.sh

    old new  
    1212# Beware: GNU libtool cannot handle directory names containing whitespace.
    1313#         Therefore, do not set M_CONF_TMPDIR to such a directory.
    1414#
    15 readonly M_CONF_TMPDIR=/tmp
     15readonly M_CONF_TMPDIR=@@TMP@@
    1616readonly M_PLISTSIGNER_TEST_KEY="`dirname $0`/prefpane/autoinstaller/TestKeys/private_key.der"
    1717
    1818# Other constants
     
    9898declare M_XCODE_VERSION_REQUIRED=""
    9999
    100100# SDK 10.5
    101 readonly M_SDK_105_ARCHS="ppc ppc64 i386 x86_64"
     101readonly M_SDK_105_ARCHS="@@ARCHS@@"
    102102declare M_SDK_105=""
    103103declare M_SDK_105_XCODE=""
    104104declare M_SDK_105_COMPILER=""
    105105
    106106# SDK 10.6
    107 readonly M_SDK_106_ARCHS="i386 x86_64"
     107readonly M_SDK_106_ARCHS="@@ARCHS@@"
    108108declare M_SDK_106=""
    109109declare M_SDK_106_XCODE=""
    110110declare M_SDK_106_COMPILER=""
    111111
    112112# SDK 10.7
    113 readonly M_SDK_107_ARCHS="i386 x86_64"
     113readonly M_SDK_107_ARCHS="@@ARCHS@@"
    114114declare M_SDK_107=""
    115115declare M_SDK_107_XCODE=""
    116116declare M_SDK_107_COMPILER=""
    117117
    118118# SDK 10.8
    119 readonly M_SDK_108_ARCHS="i386 x86_64"
     119readonly M_SDK_108_ARCHS="@@ARCHS@@"
    120120declare M_SDK_108=""
    121121declare M_SDK_108_XCODE=""
    122122declare M_SDK_108_COMPILER=""
    123123
    124124# SDK 10.9
    125 readonly M_SDK_109_ARCHS="i386 x86_64"
     125readonly M_SDK_109_ARCHS="@@ARCHS@@"
    126126declare M_SDK_109=""
    127127declare M_SDK_109_XCODE=""
    128128declare M_SDK_109_COMPILER=""
     
    18411841
    18421842    local ms_osxfuse_out="$M_CONF_TMPDIR/osxfuse-homebrew-$ms_os_version-$ms_osxfuse_version"
    18431843    local ms_osxfuse_build="$ms_osxfuse_out/build/"
    1844     local ms_osxfuse_root="$m_prefix"
     1844    local ms_osxfuse_root="@@DESTROOT@@$m_prefix"
    18451845
    18461846    if [ -e "$ms_osxfuse_out" ]
    18471847    then
     
    19451945    xcrun make -j4 >$m_stdout 2>$m_stderr
    19461946    m_exit_on_error "make failed while compiling the OSXFUSE library."
    19471947
    1948     xcrun make install >$m_stdout 2>$m_stderr
     1948    xcrun make install DESTDIR="@@DESTROOT@@" >$m_stdout 2>$m_stderr
    19491949    m_exit_on_error "cannot prepare library build for installation."
    19501950
    19511951    for f in "$ms_osxfuse_root"/lib/libosxfuse_i64*.dylib; do