Changeset 18687 for trunk/base

Timestamp:

Jul 22, 2006, 9:16:10 AM (18 years ago)

Author:

pguyot (Paul Guyot)

Message:

Fix the problem of -t with XFree86 by getting the prefix from autoconf instead
of relying on ${prefix}.

Location:

trunk/base/src/port1.0

Files:

• port_autoconf.tcl.in (modified) (2 diffs)
• porttrace.tcl (modified) (3 diffs)

trunk/base/src/port1.0/port_autoconf.tcl.in

@@ -1 +1 @@
 # 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.
@@ -40 +40 @@
         variable install_user "@DSTUSR@"
         variable install_group "@DSTGRP@"
+        variable prefix "@prefix_expanded@"
 }

trunk/base/src/port1.0/porttrace.tcl

@@ -2 +2 @@
 # 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>,
@@ -42 +42 @@
                         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"
@@ -54 +54 @@
                         
                         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"