5 files changed, 103 insertions, 4 deletions
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index e08297a..76fc705 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -5597,7 +5597,7 @@ of each directory in $FORTRANPATH.
 Directory location where the Fortran compiler should place
 any module files it generates.  This variable is empty, by default. Some 
 Fortran compilers will internally append this directory in the search path 
-for module files, as well
+for module files, as well.
 
 .IP FORTRANMODDIRPREFIX
 The prefix used to specify a module directory on the Fortran compiler command
@@ -5613,7 +5613,7 @@ This will be appended to the beginning of the directory
 in the $FORTRANMODDIR construction variables
 when the $_FORTRANMODFLAG variables is automatically generated.
 
-.IP FORTRANMODFLAG
+.IP _FORTRANMODFLAG
 An automatically-generated construction variable
 containing the Fortran compiler command-line option
 for specifying the directory location where the Fortran
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 8d39946..cbc0a72 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -554,6 +554,11 @@ RELEASE 0.97 - XXX
   - Add a PathAccept validator to the list of new canned PathOption
     validators.
 
+  From Craig Scott:
+
+  - Have the Fortran module emitter look for Fortan modules to be created
+    relative to $FORTRANMODDIR, not the top-level directory.
+
   From Jeff Squyres:
 
   - Documentation changes:  Use $CPPDEFINES instead of $CCFLAGS in man
diff --git a/src/engine/SCons/Tool/fortran.py b/src/engine/SCons/Tool/fortran.py
index 180c811..d559ac8 100644
--- a/src/engine/SCons/Tool/fortran.py
+++ b/src/engine/SCons/Tool/fortran.py
@@ -78,9 +78,10 @@ def _fortranEmitter(target, source, env):
     modules = SCons.Util.unique(modules)
     # Convert module name to a .mod filename
     suffix = env.subst('$FORTRANMODSUFFIX')
+    moddir = env.subst('$FORTRANMODDIR')
     modules = map(lambda x, s=suffix: string.lower(x) + s, modules)
     for m in modules:
-       target.append(env.fs.File(m))
+       target.append(env.fs.File(m, moddir))
     return (target, source)
 
 def FortranEmitter(target, source, env):
diff --git a/src/engine/SCons/Tool/fortran.xml b/src/engine/SCons/Tool/fortran.xml
index 4282f30..bfc34fa 100644
--- a/src/engine/SCons/Tool/fortran.xml
+++ b/src/engine/SCons/Tool/fortran.xml
@@ -65,7 +65,7 @@ of each directory in &cv-FORTRANPATH;.
 Directory location where the Fortran compiler should place
 any module files it generates.  This variable is empty, by default. Some 
 Fortran compilers will internally append this directory in the search path 
-for module files, as well
+for module files, as well.
 </summary>
 </cvar>
 
diff --git a/test/Fortran/FORTRANMODDIR.py b/test/Fortran/FORTRANMODDIR.py
new file mode 100644
index 0000000..4d594a1
--- /dev/null
+++ b/test/Fortran/FORTRANMODDIR.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import os
+import string
+import sys
+import TestSCons
+
+python = TestSCons.python
+_exe   = TestSCons._exe
+
+test = TestSCons.TestSCons()
+
+
+
+test.write('myfortran.py', r"""
+import os.path
+import re
+import string
+import sys
+mod_regex = "(?im)^\\s*MODULE\\s+(?!PROCEDURE)(\\w+)"
+contents = open(sys.argv[2]).read()
+modules = re.findall(mod_regex, contents)
+modules = map(lambda m: os.path.join(sys.argv[1], string.lower(m)+'.mod'), modules)
+for t in sys.argv[3:] + modules:
+    open(t, 'wb').write('myfortran.py wrote %s\n' % os.path.split(t)[1])
+sys.exit(0)
+""")
+
+test.write('SConstruct', """
+env = Environment(FORTRANCOM = r'%(python)s myfortran.py $FORTRANMODDIR $SOURCE $TARGET',
+                  FORTRANMODDIR = 'modules')
+env.Object(target = 'test1.obj', source = 'test1.f')
+""" % locals())
+
+test.write('test1.f', """\
+      PROGRAM TEST
+      USE MOD_FOO
+      USE MOD_BAR
+      PRINT *,'TEST.f'
+      CALL P
+      STOP
+      END
+      MODULE MOD_FOO
+         IMPLICIT NONE
+         CONTAINS
+         SUBROUTINE P
+            PRINT *,'mod_foo'
+         END SUBROUTINE P
+      END MODULE MOD_FOO
+      MODULE PROCEDURE MOD_BAR
+         IMPLICIT NONE
+         CONTAINS
+         SUBROUTINE P
+            PRINT *,'mod_bar'
+         END SUBROUTINE P
+      END MODULE MOD_BAR
+""")
+
+test.run(arguments = '.', stderr = None)
+
+test.must_match('test1.obj', "myfortran.py wrote test1.obj\n")
+test.must_match(['modules', 'mod_foo.mod'], "myfortran.py wrote mod_foo.mod\n")
+test.must_not_exist(['modules', 'mod_bar.mod'])
+
+test.up_to_date(arguments = '.')
+
+
+
+test.pass_test()