/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch
Patch | 51 lines | 47 code | 4 blank | 0 comment | 0 complexity | 93c7f1bb312a360df4eaf2c8a67b6eb6 MD5 | raw file
Possible License(s): GPL-3.0, GPL-2.0, LGPL-3.0, CC-BY-SA-3.0, LGPL-2.1, MIT, AGPL-3.0, MPL-2.0-no-copyleft-exception, Unlicense, CC0-1.0, LGPL-2.0, BSD-3-Clause, BitTorrent-1.0, Apache-2.0, AGPL-1.0
- --- root/Makefile.orig 2012-07-13 13:42:46.000000000 +0400
- +++ root/Makefile 2012-07-22 00:15:03.282994389 +0400
- @@ -1087,16 +1087,7 @@
-
- ifeq ($(BUILDX11),yes)
- ifeq ($(BUILDASIMAGE),yes)
- -html: rootexecs postbin changelog releasenotes
- -ifneq ($(USECONFIG),FALSE)
- - @if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
- - || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
- - echo 'ERROR: root.exe has not been installed by this build.'; \
- - echo ' Run "make install" before running "make html".'; \
- - exit 1; \
- - fi
- -endif
- - @$(MAKELOGHTML)
- +html: compiledata releasenotes
- @$(MAKEHTML)
- else
- html:
- --- root/build/unix/makehtml.sh.orig 2012-06-28 11:33:36.000000000 +0400
- +++ root/build/unix/makehtml.sh 2012-07-22 00:18:58.705804436 +0400
- @@ -1,16 +1,16 @@
- #! /bin/sh
-
- dir=`pwd`
- -ROOT=$dir/bin/root
- +ROOT=root
- cd tutorials
- # we need tutorials/hsimple.root
- if [ ! -f hsimple.root ]; then
- - $ROOT -l -b -q hsimple.C
- + $ROOT -l -b -q hsimple.C && exit 1
- fi
- cd tree
- # we need tutorials/tree/cernstaff.root
- if [ ! -f cernstaff.root ]; then
- - $ROOT -l -b -q cernbuild.C
- + $ROOT -l -b -q cernbuild.C || exit 1
- fi
- cd $dir
-
- @@ -20,7 +20,7 @@
-
- # To generate the full documentation, we do need to
- # use the graphics engine, so do not use '-b'.
- -$ROOT -l <<makedoc
- +$ROOT -l <<makedoc || exit 1
- THtml h;
- h.LoadAllLibs();
- h.MakeAll();