diff options
| author | Marek Safar <marek.safar@gmail.com> | 2018-11-28 19:47:59 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-11-28 19:47:59 +0300 |
| commit | cd69b727d05e74f607dd98980084fca3c741968f (patch) | |
| tree | ca6bf72e79028b5876c46eba9b370952df7a7980 | |
| parent | fb42448b703fdce382fef01e6e4173bfa8ff9c20 (diff) | |
[build] Fixes documentation build profile dependency (#11801)
| -rw-r--r-- | docs/Makefile.am | 5 | ||||
| -rw-r--r-- | mcs/build/rules.make | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index 95519541ea3..61faaeae604 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -52,7 +52,8 @@ EXTRA_DIST = \ -include $(mcs_topdir)/build/config.make -CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE) +DOC_PROFILE:=net_4_x +CLASS=$(mcs_topdir)/class/lib/$(DOC_PROFILE) dist-hook: $(mkdir_p) $(distdir)/sources @@ -68,7 +69,7 @@ clean-local: -rm -f deploy/* convert.exe* AgilityPack.dll* -rm -f $(ASSEMBLED_DOCS) -TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir) +TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir) PROFILE=$(DOC_PROFILE) monoapi.zip: monoapi.tree diff --git a/mcs/build/rules.make b/mcs/build/rules.make index b725b7005a0..0d90e64b04a 100644 --- a/mcs/build/rules.make +++ b/mcs/build/rules.make @@ -339,7 +339,7 @@ dist-default: ## Documentation stuff Q_MDOC =$(if $(V),,@echo "MDOC [$(PROFILE_DIRECTORY)] $(notdir $(@))";) -MDOC =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe +MDOC =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(PROFILE_DIRECTORY)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(PROFILE_DIRECTORY)/mdoc.exe Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE_DIRECTORY)] $(notdir $(@))";) -MDOC_UP =$(Q_MDOC_UP) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe update --delete -o Documentation/en +MDOC_UP =$(Q_MDOC_UP) MONO_PATH="$(topdir)/class/lib/$(PROFILE_DIRECTORY)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(PROFILE_DIRECTORY)/mdoc.exe update --delete -o Documentation/en |