diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2010-09-22 13:14:26 +0400 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2010-09-22 13:14:26 +0400 |
| commit | 132695aa93a64007c83f1047f7dafc253dfe0ae3 (patch) | |
| tree | dca682d4b79174cb3ce7320da0c7549b0fe351d1 | |
| parent | 313633fc67cf1479514019a56143e5ad1643d28f (diff) | |
Revert "mdoc 2.0-only profile build support, take 2!"
This reverts commit 313633fc67cf1479514019a56143e5ad1643d28f because it breaks the build.
| -rw-r--r-- | mcs/tools/Makefile | 2 | ||||
| -rw-r--r-- | mono-core.spec.in | 2 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile index 1546ddb2c69..8117f1ae7a8 100644 --- a/mcs/tools/Makefile +++ b/mcs/tools/Makefile @@ -9,7 +9,6 @@ per_profile_dirs = \ culevel \ genxs \ mkbundle \ - mdoc \ monop \ mono-service \ mono-xsd \ @@ -47,6 +46,7 @@ net_4_0_dirs := \ net_2_0_dirs := \ $(per_profile_dirs) \ monodoc \ + mdoc \ compiler-tester moonlight_dirs := \ diff --git a/mono-core.spec.in b/mono-core.spec.in index 591c66c8d3d..513bd77cabc 100644 --- a/mono-core.spec.in +++ b/mono-core.spec.in @@ -1163,7 +1163,7 @@ Monodoc-core contains documentation tools for C#. %_mandir/man1/monodocer.1%ext_man %_mandir/man1/monodocs2html.1%ext_man %_mandir/man5/mdoc.5%ext_man -%_prefix/lib/mono/4.0/mdoc.exe* +%_prefix/lib/mono/2.0/mdoc.exe* %_prefix/lib/mono/4.0/mod.exe* %_prefix/lib/mono/gac/monodoc %_prefix/lib/mono/monodoc diff --git a/scripts/Makefile.am b/scripts/Makefile.am index c15e86eddf5..e95e2a76c7d 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -56,6 +56,7 @@ scripts_2_0 = \ csharp2$(SCRIPT_SUFFIX) \ gacutil2$(SCRIPT_SUFFIX) \ gmcs$(SCRIPT_SUFFIX) \ + mdoc$(SCRIPT_SUFFIX) \ monop2$(SCRIPT_SUFFIX) \ resgen2$(SCRIPT_SUFFIX) \ wsdl2$(SCRIPT_SUFFIX) @@ -68,7 +69,6 @@ scripts_4_0 = \ installvst$(SCRIPT_SUFFIX) \ genxs$(SCRIPT_SUFFIX) \ macpack$(SCRIPT_SUFFIX) \ - mdoc$(SCRIPT_SUFFIX) \ mono-cil-strip$(SCRIPT_SUFFIX) \ prj2make$(SCRIPT_SUFFIX) \ soapsuds$(SCRIPT_SUFFIX) \ |