summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2004-01-16 02:56:17 (GMT)
committerSteven Knight <knight@baldmt.com>2004-01-16 02:56:17 (GMT)
commit4ad2624f3ec90a7dc4865b2955f8f972dec8cee2 (patch)
tree7eeb191bfb36afce097c1bbc7992fc3e18171187 /src
parent238043e03ddcf883374431f46a0ad311122ac909 (diff)
downloadSCons-4ad2624f3ec90a7dc4865b2955f8f972dec8cee2.zip
SCons-4ad2624f3ec90a7dc4865b2955f8f972dec8cee2.tar.gz
SCons-4ad2624f3ec90a7dc4865b2955f8f972dec8cee2.tar.bz2
Make the midl builder put the targets in the target directory, rather than the source directory. (Anthony Roach)
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt3
-rw-r--r--src/engine/SCons/Tool/midl.py4
2 files changed, 5 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 45b9df3..553c05e 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -141,6 +141,9 @@ RELEASE 0.95 - XXX
- Don't choke if a construction variable is a non-string value.
+ - Build Type Libraries in the target directory, not the source
+ directory.
+
RELEASE 0.94 - Fri, 07 Nov 2003 05:29:48 -0600
diff --git a/src/engine/SCons/Tool/midl.py b/src/engine/SCons/Tool/midl.py
index a3f8165..fe424fc 100644
--- a/src/engine/SCons/Tool/midl.py
+++ b/src/engine/SCons/Tool/midl.py
@@ -41,8 +41,8 @@ import SCons.Util
def midl_emitter(target, source, env):
"""Produces a list of outputs from the MIDL compiler"""
- base, ext = SCons.Util.splitext(str(source[0]))
- tlb = base + '.tlb'
+ base, ext = SCons.Util.splitext(str(target[0]))
+ tlb = target[0]
incl = base + '.h'
interface = base + '_i.c'
proxy = base + '_p.c'