diff --git a/backends.py b/backends.py index fcc2dff5a..ff80a595f 100755 --- a/backends.py +++ b/backends.py @@ -361,7 +361,7 @@ class NinjaBackend(Backend): for i in range(len(infilelist)): infilename = os.path.join(self.build_to_src, infilelist[i]) outfilename = os.path.join(self.get_target_dir(target), outfilelist[i]) - args = [x.replace("@INPUTNAME@", infilename).replace('@OUTPUTNAME@', outfilename)\ + args = [x.replace("@INPUT@", infilename).replace('@OUTPUT@', outfilename)\ for x in base_args] cmdlist = [exe_file] + args build = 'build %s: CUSTOM_COMMAND %s | %s\n' % \ diff --git a/test cases/30 pipeline/meson.build b/test cases/30 pipeline/meson.build index f43d18cea..e93890f86 100644 --- a/test cases/30 pipeline/meson.build +++ b/test cases/30 pipeline/meson.build @@ -3,8 +3,8 @@ project('pipeline test', 'c') e1 = executable('srcgen', 'srcgen.c') gen = generator(e1, \ -name_rule : '@BASENAME@.c', \ -arguments : ['@INPUTNAME@', '@OUTPUTNAME@']) + name_rule : '@BASENAME@.c', \ + arguments : ['@INPUT@', '@OUTPUT@']) generated = gen.process('input_src.dat')