Skip to content
Permalink
Browse files

Fix the problem of -t with XFree86 by getting the prefix from autocon…

…f instead

of relying on ${prefix}.

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@18687 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
pguyot committed Jul 22, 2006
1 parent a772f30 commit 4ef9dc87bf2be64528540fc0cab8dfbddba28d19
Showing with 5 additions and 4 deletions.
  1. +2 −1 src/port1.0/port_autoconf.tcl.in
  2. +3 −3 src/port1.0/porttrace.tcl
@@ -1,5 +1,5 @@
# port_autoconf.tcl.in
# $Id: port_autoconf.tcl.in,v 1.8 2006/03/21 20:10:18 jberry Exp $
# $Id: port_autoconf.tcl.in,v 1.9 2006/07/22 09:16:09 pguyot Exp $
#
# Copyright (c) 2002 - 2004 Apple Computer, Inc.
# All rights reserved.
@@ -39,4 +39,5 @@ namespace eval portutil::autoconf {
variable launchctl_path "@LAUNCHCTL@"
variable install_user "@DSTUSR@"
variable install_group "@DSTGRP@"
variable prefix "@prefix_expanded@"
}
@@ -1,7 +1,7 @@
# et:ts=4
# porttrace.tcl
#
# $Id: porttrace.tcl,v 1.15 2006/07/22 03:11:02 pguyot Exp $
# $Id: porttrace.tcl,v 1.16 2006/07/22 09:16:10 pguyot Exp $
#
# Copyright (c) 2005 Paul Guyot <pguyot@kallisys.net>,
# All rights reserved.
@@ -41,7 +41,7 @@ proc trace_start {workpath} {
if {[catch {package require Thread} error]} {
ui_warn "trace requires Tcl Thread package ($error)"
} else {
global prefix env trace_fifo
global env trace_fifo
# Create a fifo.
set trace_fifo "$workpath/trace_fifo"
file delete -force $trace_fifo
@@ -53,7 +53,7 @@ proc trace_start {workpath} {
# Launch darwintrace.dylib.

set env(DYLD_INSERT_LIBRARIES) \
"$prefix/share/darwinports/Tcl/darwintrace1.0/darwintrace.dylib"
[file join ${portutil::autoconf::prefix} share darwinports Tcl darwintrace1.0 darwintrace.dylib]
set env(DYLD_FORCE_FLAT_NAMESPACE) 1
set env(DARWINTRACE_LOG) "$trace_fifo"
}

0 comments on commit 4ef9dc8

Please sign in to comment.
You can’t perform that action at this time.