diff options
| -rw-r--r-- | base/base.gyp | 7 | ||||
| -rw-r--r-- | base/base.scons | 3 | ||||
| -rwxr-xr-x | chrome/tools/build/linux/version.sh | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/base/base.gyp b/base/base.gyp index 2c185d3..73b9d9c 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -326,7 +326,7 @@ 'variables': { 'template_input_path': 'file_version_info_linux.h.version', 'template_output_path': - '<(INTERMEDIATE_DIR)/base/file_version_info_linux.h', + '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.h', }, 'inputs': [ '<(template_input_path)', @@ -344,17 +344,16 @@ # Use a non-existant output so this action always runs and # generates version information, e.g. to capture revision # changes, which aren't captured by file dependencies. - '<(INTERMEDIATE_DIR)/base/file_version_info_linux.bogus', + '<(SHARED_INTERMEDIATE_DIR)/base/file_version_info_linux.bogus', ], 'action': [ '../chrome/tools/build/linux/version.sh', '<(template_input_path)', '<(template_output_path)', - '../chrome' ], }, ], 'include_dirs': [ - '<(INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)', ], 'sources/': [ ['exclude', '_(mac|win)\\.cc$'], ['exclude', '\\.mm?$' ] ], diff --git a/base/base.scons b/base/base.scons index 09f5948..e7d72a3 100644 --- a/base/base.scons +++ b/base/base.scons @@ -408,8 +408,7 @@ if env.Bit('linux'): 'file_version_info_linux.h.version', ('../chrome/tools/build/linux/version.sh' ' ${SOURCE}' - ' ${TARGET}' - ' ../chrome')) + ' ${TARGET}')) env.AlwaysBuild(linux_version) # Always generate version information, e.g. to capture revision changes, which # aren't captured by file dependencies. diff --git a/chrome/tools/build/linux/version.sh b/chrome/tools/build/linux/version.sh index 22fa30a..31d92d4 100755 --- a/chrome/tools/build/linux/version.sh +++ b/chrome/tools/build/linux/version.sh @@ -9,7 +9,7 @@ TMPL="$1" OUTFILE="$2" -CHROMEDIR="$3" +CHROMEDIR=$(readlink -f $(dirname "$0")/../../../) # Load version digits as environment variables. source "$CHROMEDIR/VERSION" |