Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj1
-rw-r--r--main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj4
-rw-r--r--main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs2
-rw-r--r--main/src/addins/MonoDevelop.Gettext/templates/Makefile_am.template (renamed from main/src/addins/MonoDevelop.Gettext/templates/Makefile.am.template)2
-rw-r--r--main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj1
5 files changed, 4 insertions, 6 deletions
diff --git a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
index d1b368e757..65b7bf4fab 100644
--- a/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
+++ b/main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser.csproj
@@ -23,7 +23,6 @@
<Execution>
<Execution clr-version="Net_2_0" />
</Execution>
- <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<NoWarn>1591;1573</NoWarn>
<DocumentationFile>..\..\..\build\AddIns\DisplayBindings\AssemblyBrowser\MonoDevelop.AssemblyBrowser.xml</DocumentationFile>
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
index f28071c231..242149be3a 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext.csproj
@@ -262,8 +262,8 @@
<EmbeddedResource Include="templates\Makefile.template">
<LogicalName>Makefile.template</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="templates\Makefile.am.template">
- <LogicalName>Makefile.am.template</LogicalName>
+ <EmbeddedResource Include="templates\Makefile_am.template">
+ <LogicalName>Makefile.am_template</LogicalName>
</EmbeddedResource>
<EmbeddedResource Include="icons\prefs-language-16.png">
<LogicalName>prefs-language-16.png</LogicalName>
diff --git a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs
index 72ddc7c24e..e4cf95da77 100644
--- a/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs
+++ b/main/src/addins/MonoDevelop.Gettext/MonoDevelop.Gettext/MakefileHandler.cs
@@ -74,7 +74,7 @@ namespace MonoDevelop.Gettext
string mt;
if (ctx.MakefileType == MakefileType.AutotoolsMakefile)
- mt = "Makefile.am.template";
+ mt = "Makefile_am.template";
else
mt = "Makefile.template";
diff --git a/main/src/addins/MonoDevelop.Gettext/templates/Makefile.am.template b/main/src/addins/MonoDevelop.Gettext/templates/Makefile_am.template
index 3962478646..68e4ee49f0 100644
--- a/main/src/addins/MonoDevelop.Gettext/templates/Makefile.am.template
+++ b/main/src/addins/MonoDevelop.Gettext/templates/Makefile_am.template
@@ -26,7 +26,7 @@ uninstall:
$(GMO_FILES): $(BUILD_DIR)/%.gmo: %.po
mkdir -p $(BUILD_DIR)
msgfmt '$<' -o '$@'
-
+
$(MO_FILES): $(INSTALL_DIR)/%/LC_MESSAGES/$(PACKAGE).mo : $(BUILD_DIR)/%.gmo
mkdir -p $(dir $@)
@INSTALL_DATA@ '$<' '$@'
diff --git a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
index 6cd40325b5..59d38ca99b 100644
--- a/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
+++ b/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.csproj
@@ -8,7 +8,6 @@
<ProjectGuid>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>MonoDevelop.SourceEditor</RootNamespace>
- <AssemblyOriginatorKeyFile>.</AssemblyOriginatorKeyFile>
<AssemblyName>MonoDevelop.SourceEditor</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<AssemblyName>MonoDevelop.SourceEditor</AssemblyName>