Revision: 38811 http://trac.macosforge.org/projects/macports/changeset/38811 Author: ryandesign@macports.org Date: 2008-07-31 16:10:15 -0700 (Thu, 31 Jul 2008) Log Message: ----------- qt4-mac: use ${applications_dir} instead of assuming /Applications/MacPorts Modified Paths: -------------- trunk/dports/aqua/qt4-mac/Portfile Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2008-07-31 23:03:45 UTC (rev 38810) +++ trunk/dports/aqua/qt4-mac/Portfile 2008-07-31 23:10:15 UTC (rev 38811) @@ -38,6 +38,11 @@ set bindir ${prefix}/libexec/${name}/bin set frameworkdir ${prefix}/Library/Frameworks +# Can be removed once MacPorts 1.7.0 is released +if {![info exists applications_dir]} { + set applications_dir /Applications/MacPorts +} + # See # http://doc.trolltech.com/qtopia4.3/buildsystem/over-configure-options-qt-1.h... # for options @@ -74,7 +79,7 @@ post-destroot { xinstall -d -m 0755 ${destroot}${bindir} - xinstall -d -m 0755 ${destroot}/Applications/MacPorts/Qt + xinstall -d -m 0755 ${destroot}${applications_dir}/Qt xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${portname} # create link in ${prefix}/bin to executable files in ${bindir} @@ -82,10 +87,10 @@ system "ln -s ${bindir}/[file tail ${bin}] ${destroot}${prefix}/bin" } - # create link in /Applications/MacPorts/Qt to .app directories in ${bindir} + # create link in ${applications_dir}/Qt to .app directories in ${bindir} # create link in ${prefix}/bin to all *.app/Contents/MacOS/* foreach app [glob -type d -directory ${destroot}${bindir} *.app] { - system "ln -s ${bindir}/[file tail ${app}] ${destroot}/Applications/MacPorts/Qt" + system "ln -s ${bindir}/[file tail ${app}] ${destroot}${applications_dir}/Qt" foreach bin [glob -type f -directory ${app} Contents/MacOS/*] { system "ln -s ${bindir}/[file tail ${app}]/Contents/MacOS/[file tail ${bin}] ${destroot}${prefix}/bin" }