diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-07-08 05:51:32 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2013-07-08 05:51:32 +0000 |
| commit | 36440e23b964d64229ba8e4c8b34f643f79b7af3 (patch) | |
| tree | b03df9100bddeb60e1dda1598c76aa212bffbdb0 /scripts | |
| parent | d05532bf391ba7f7d147a598e737788787b9a7d5 (diff) | |
| download | gtest-36440e23b964d64229ba8e4c8b34f643f79b7af3.tar.gz gtest-36440e23b964d64229ba8e4c8b34f643f79b7af3.tar.bz2 gtest-36440e23b964d64229ba8e4c8b34f643f79b7af3.tar.xz | |
allows gtest-config.in to work with an absoulte path for @top_srcdir@. h/t to Jimi Xenidis for reporting the issue and the fix.
git-svn-id: http://googletest.googlecode.com/svn/trunk@658 861a406c-534a-0410-8894-cb66d6ee9925
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/gtest-config.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/gtest-config.in b/scripts/gtest-config.in index 9c72638..780f843 100755 --- a/scripts/gtest-config.in +++ b/scripts/gtest-config.in @@ -209,7 +209,7 @@ if test "${this_bindir}" = "${this_bindir%${bindir}}"; then # The path to the script doesn't end in the bindir sequence from Autoconf, # assume that we are in a build tree. build_dir=`dirname ${this_bindir}` - src_dir=`cd ${this_bindir}/@top_srcdir@; pwd -P` + src_dir=`cd ${this_bindir}; cd @top_srcdir@; pwd -P` # TODO(chandlerc@google.com): This is a dangerous dependency on libtool, we # should work to remove it, and/or remove libtool altogether, replacing it |