A bunch more conversions.

6 files changed, 17 insertions, 17 deletions

diff --git a/modules/gnome.py b/modules/gnome.py
index ac68515..04f5693 100644
--- a/modules/gnome.py
+++ b/modules/gnome.py
@@ -139,9 +139,9 @@ class GnomeModule:
             inc_dirs = kwargs.pop('include_directories')
             if not isinstance(inc_dirs, list):
                 inc_dirs = [inc_dirs]
-            for id in inc_dirs:
-                if isinstance(id.held_object, build.IncludeDirs):
-                    scan_command += ['--add-include-path=%s' % inc for inc in id.held_object.get_incdirs()]
+            for ind in inc_dirs:
+                if isinstance(ind.held_object, build.IncludeDirs):
+                    scan_command += ['--add-include-path=%s' % inc for inc in ind.held_object.get_incdirs()]
                 else:
                     raise MesonException('Gir include dirs should be include_directories()')
         if isinstance(girtarget, build.Executable):
@@ -248,7 +248,7 @@ class GnomeModule:
             cmd += ['--interface-prefix', kwargs.pop('interface_prefix')]
         if 'namespace' in kwargs:
             cmd += ['--c-namespace', kwargs.pop('namespace')]
-        cmd += ['--generate-c-code', os.path.join(state.subdir, namebase), '@INPUT@']
+        cmd += ['--generate-c-code', '@OUTDIR@/' + namebase, '@INPUT@']
         outputs = [namebase + '.c', namebase + '.h']
         custom_kwargs = {'input' : xml_file,
                          'output' : outputs,
diff --git a/ninjabackend.py b/ninjabackend.py
index 9258131..cf7db67 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -306,8 +306,8 @@ class NinjaBackend(backends.Backend):
                 cmd += srcs
             elif i == '@OUTPUT@':
                 cmd += ofilenames
-            elif i == '@OUTDIR@':
-                cmd.append(self.get_target_dir(target))
+            elif '@OUTDIR@' in i:
+                cmd.append(i.replace('@OUTDIR@', self.get_target_dir(target)))
             else:
                 cmd.append(i)
 
@@ -1063,7 +1063,7 @@ rule FORTRAN_DEP_HACK
                 args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', sole_output)\
                         for x in base_args]
                 args = self.replace_outputs(args, self.get_target_private_dir_abs(target), outfilelist)
-                relout = os.path.join(target.subdir, target.get_basename() + target.type_suffix())
+                relout = self.get_target_private_dir(target)
                 args = [x.replace("@SOURCE_DIR@", self.build_to_src).replace("@BUILD_DIR@", relout)
                         for x in args]
                 cmdlist = exe_arr + args
diff --git a/test cases/common/65 multiple generators/meson.build b/test cases/common/65 multiple generators/meson.build
index b6fd038..66f7fa9 100644
--- a/test cases/common/65 multiple generators/meson.build
+++ b/test cases/common/65 multiple generators/meson.build
@@ -4,10 +4,10 @@ comp = find_program('mygen.py')
 subdir('subdir')
 
 generated2 = custom_target('generated2',
-output : ['source2.h', 'source2.cpp'],
-input : 'data2.dat',
-command : [comp, '@INPUT0@', meson.current_build_dir()])
+  output : ['source2.h', 'source2.cpp'],
+  input : 'data2.dat',
+  command : [comp, '@INPUT0@', '@OUTDIR@'])
 
 exe = executable('prog', 'main.cpp', generated, generated2,
-include_directories : include_directories('subdir'))
-test('generated test', exe)
+  include_directories : include_directories('subdir'))
+  test('generated test', exe)
diff --git a/test cases/common/65 multiple generators/subdir/meson.build b/test cases/common/65 multiple generators/subdir/meson.build
index 49c6248..2456ecb 100644
--- a/test cases/common/65 multiple generators/subdir/meson.build
+++ b/test cases/common/65 multiple generators/subdir/meson.build
@@ -1,4 +1,4 @@
 generated = custom_target('generated',
 output : ['source1.h', 'source1.cpp'],
 input : 'data.dat',
-command : [comp, '@INPUT0@', meson.current_build_dir()])
+command : [comp, '@INPUT0@', '@OUTDIR@'])
diff --git a/test cases/common/78 ctarget dependency/gen2.py b/test cases/common/78 ctarget dependency/gen2.py
index 3f3595b..3a8be7d 100755
--- a/test cases/common/78 ctarget dependency/gen2.py
+++ b/test cases/common/78 ctarget dependency/gen2.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-import sys
+import sys, os
 from glob import glob
 
-files = glob('*.tmp')
+files = glob(os.path.join(sys.argv[1], '*.tmp'))
 assert(len(files) == 1)
 
-open(sys.argv[1], 'w').write(open(files[0], 'r').read())
+open(sys.argv[2], 'w').write(open(files[0], 'r').read())
diff --git a/test cases/common/78 ctarget dependency/meson.build b/test cases/common/78 ctarget dependency/meson.build
index baed2da..cd11951 100644
--- a/test cases/common/78 ctarget dependency/meson.build
+++ b/test cases/common/78 ctarget dependency/meson.build
@@ -16,5 +16,5 @@ command : [g1, '@INPUT@', '@OUTPUT@'])
 
 custom_target('output',
 output : 'output.dat',
-command : [g2, '@OUTPUT@'],
+command : [g2, '@OUTDIR@', '@OUTPUT@'],
 depends : c1)