From 8dc4c8c6fd1de4325494b6c225ef910b17e0ee2b Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 23 Apr 2013 18:43:00 +0000 Subject: [PATCH] Merge revision 1240 changes: - Linux: Fix paths in binary distrib make files that caused build errors on Debian. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1453@1241 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef1/tools/make_distrib.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cef1/tools/make_distrib.py b/cef1/tools/make_distrib.py index 820c87f54..c88486ce6 100644 --- a/cef1/tools/make_distrib.py +++ b/cef1/tools/make_distrib.py @@ -233,7 +233,7 @@ def create_make_projects(): # Restore the original Makefile move_file(makefile_tmp, makefile, options.quiet) - # Fix the output directory path in Makefile all .mk files. + # Fix the output directory path in Makefile and all .mk files. find = os.path.relpath(output_dir, src_dir) files = [os.path.join(output_dir, 'Makefile')] for file in get_files(os.path.join(output_dir, '*.mk')): @@ -241,6 +241,7 @@ def create_make_projects(): for file in files: data = read_file(file) data = data.replace(find, '.') + data = data.replace('/./', '/') if os.path.basename(file) == 'Makefile': # remove the quiet_cmd_regen_makefile section pos = str.find(data, 'quiet_cmd_regen_makefile')