diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2008-11-01 11:49:01 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2008-11-01 11:49:01 +0300 |
| commit | 461f3d77809025a6a38d1e96b07940c8153d3f1f (patch) | |
| tree | 73d1b30e0761229ea695ff7f1f10162a60aac842 /docs | |
| parent | 0ddcf6a74d7648478e33c24114ca355086d988db (diff) | |
* Makefile.am: Clean up for srcdir != builddir.
(deploy/.stamp): Compute location of 'mono-wrapper' and pass to exdoc.
* exdoc (mono-wrapper): Use $runtimedir to look for 'mono-wrapper'.
svn path=/trunk/mono/; revision=117609
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ChangeLog | 6 | ||||
| -rw-r--r-- | docs/Makefile.am | 27 | ||||
| -rw-r--r-- | docs/deploy/.stamp | 0 | ||||
| -rw-r--r-- | docs/exdoc | 2 |
4 files changed, 19 insertions, 16 deletions
diff --git a/docs/ChangeLog b/docs/ChangeLog index f0536ea441f..95ad3448ab5 100644 --- a/docs/ChangeLog +++ b/docs/ChangeLog @@ -1,3 +1,9 @@ +2008-11-01 Raja R Harinath <harinath@hurrynot.org> + + * Makefile.am: Clean up for srcdir != builddir. + (deploy/.stamp): Compute location of 'mono-wrapper' and pass to exdoc. + * exdoc (mono-wrapper): Use $runtimedir to look for 'mono-wrapper'. + 2008-10-31 Jonathan Pryor <jpryor@novell.com> * check, Makefile.am (EXTRA_DIST): Rename to check-exports. This was diff --git a/docs/Makefile.am b/docs/Makefile.am index 63f9bfe1f35..247dfc4e4ef 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -68,26 +68,23 @@ dist-hook: cp sources/* $(distdir)/sources cp svgs/* $(distdir)/svgs -CLEANFILES = \ - convert.exe* \ - deploy/.stamp \ - $(wildcard deploy/*) \ - $(ASSEMBLED_DOCS) - clean-local: - -rm -Rf html + -rm -Rf $(srcdir)/html + -rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe* + -cd $(srcdir) && rm -f $(ASSEMBLED_DOCS) -monoapi.tree monoapi.zip: monoapi.make Makefile.am toc.xml deploy/.stamp - cp api-style.css deploy - $(MAKE) -f $< topdir=$(mcs_topdir) assemble +monoapi.tree monoapi.zip: monoapi.make Makefile.am toc.xml $(srcdir)/deploy/.stamp + cp $(srcdir)/api-style.css $(srcdir)/deploy/ + cd $(srcdir) && $(MAKE) -f monoapi.make topdir=$(mcs_topdir_from_srcdir) assemble -deploy/.stamp: convert.exe Makefile.am - $(mkdir_p) html - perl exdoc -h . ../mono/*/*.c +$(srcdir)/deploy/.stamp: convert.exe Makefile.am + $(mkdir_p) $(srcdir)/html + runtimedir=`cd ../runtime && pwd`; export runtimedir; \ + cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c touch $@ -extract : deply/.stamp +extract: $(srcdir)/deploy/.stamp convert.exe: monoapi.make convert.cs Makefile.am - $(MAKE) -f $< topdir=$(mcs_topdir) convert.exe + cd $(srcdir) && $(MAKE) -f monoapi.make topdir=$(mcs_topdir_from_srcdir) convert.exe diff --git a/docs/deploy/.stamp b/docs/deploy/.stamp new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/docs/deploy/.stamp diff --git a/docs/exdoc b/docs/exdoc index 671dc02b608..e161a0c3d42 100644 --- a/docs/exdoc +++ b/docs/exdoc @@ -135,7 +135,7 @@ EOF </html> EOF close OUT; - system ("../runtime/mono-wrapper convert.exe $dir/html/$name $dir/html/x-$name"); + system ("$ENV{runtimedir}/mono-wrapper convert.exe $dir/html/$name $dir/html/x-$name"); # clean up the mess that AgilityPack does, it CDATAs our CSS open HACK, "$dir/html/x-$name" || die "Could not open $dir/html/x-$name"; |