diff options
| author | Lluis Sanchez <lluis@novell.com> | 2010-02-17 23:27:13 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2010-02-17 23:27:13 +0300 |
| commit | e76c998df7c1719516c59e1ae36c3b2f7e1ed88f (patch) | |
| tree | dc1b4cfaee7837f278b3a1224a37250df993fcde /main/src/addins/MonoDevelop.Autotools | |
| parent | 1422cc173040bb6c9a1267270a118aee96816d20 (diff) | |
* MakefileData.cs: Fix assembly resolution issue when loading a
project.
svn path=/trunk/monodevelop/; revision=151928
Diffstat (limited to 'main/src/addins/MonoDevelop.Autotools')
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/ChangeLog | 5 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.Autotools/MakefileData.cs | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/main/src/addins/MonoDevelop.Autotools/ChangeLog b/main/src/addins/MonoDevelop.Autotools/ChangeLog index f9d0f99e65..65d270827d 100644 --- a/main/src/addins/MonoDevelop.Autotools/ChangeLog +++ b/main/src/addins/MonoDevelop.Autotools/ChangeLog @@ -1,3 +1,8 @@ +2010-02-17 Lluis Sanchez Gual <lluis@novell.com> + + * MakefileData.cs: Fix assembly resolution issue when loading + a project. + 2010-02-16 Lluis Sanchez Gual <lluis@novell.com> * Makefile.am: diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs index 7d7c2d0f61..f12e0baac3 100644 --- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs +++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs @@ -1054,12 +1054,14 @@ namespace MonoDevelop.Autotools refname = ResolveBuildVars (refname, ref varFound); EncodeValues [refVar.Name] |= varFound; - //if refname is part of a package then add as gac - if (refname.IndexOf (Path.DirectorySeparatorChar) < 0 && + string fullpath = Path.GetFullPath (Path.Combine (BaseDirectory, refname)); + + // if refname is part of a package then add as gac + // but don't do it if the refname exactly matches a file name in the project dir + if (refname.IndexOf (Path.DirectorySeparatorChar) < 0 && !File.Exists (fullpath) && ParseReferenceAsGac (refname, project) != null) continue; - string fullpath = Path.GetFullPath (Path.Combine (BaseDirectory, refname)); if (TryGetExistingGacRef (fullpath) != null) continue; |