summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-doc/root-docs/files/root-docs-5.34-makehtml.patch')
-rw-r--r--app-doc/root-docs/files/root-docs-5.34-makehtml.patch52
1 files changed, 52 insertions, 0 deletions
diff --git a/app-doc/root-docs/files/root-docs-5.34-makehtml.patch b/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
new file mode 100644
index 000000000000..57fb69b37b4a
--- /dev/null
+++ b/app-doc/root-docs/files/root-docs-5.34-makehtml.patch
@@ -0,0 +1,52 @@
+--- root/Makefile.orig 2012-05-30 00:50:46.000000000 +0400
++++ root/Makefile 2012-05-30 00:51:05.839679686 +0400
+@@ -1088,16 +1088,7 @@
+ releasenotes:
+ @$(MAKERELNOTES)
+
+-html: $(ROOTEXE) 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)
+
+ # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
+--- root/build/unix/makehtml.sh.orig 2012-06-18 06:44:59.000000000 +0400
++++ root/build/unix/makehtml.sh 2012-06-18 19:39:41.262064654 +0400
+@@ -1,17 +1,17 @@
+ #! /bin/sh
+
+-ROOT=bin/root.exe
++ROOT=root.exe
+
+ dir=`pwd`
+ 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
+
+@@ -19,7 +19,7 @@
+ echo "Generating doc in directory htmldoc/..."
+ echo ""
+
+-$ROOT -l <<makedoc
++$ROOT -l <<makedoc || exit 1
+ THtml h;
+ h.LoadAllLibs();
+ h.MakeAll();