You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
56 lines
1.5 KiB
56 lines
1.5 KiB
9 years ago
|
diff --git a/Makefile b/Makefile
|
||
|
index 600e8db..afad025 100644
|
||
|
--- a/Makefile
|
||
|
+++ b/Makefile
|
||
|
@@ -1072,16 +1072,7 @@ $(ROOTPCH): $(ROOTCLINGSTAGE1DEP) $(ALLHDRS) $(CLINGETCPCH) $(ORDER_) $(ALLLIBS)
|
||
12 years ago
|
|
||
|
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:
|
||
9 years ago
|
diff --git a/build/unix/makehtml.sh b/build/unix/makehtml.sh
|
||
|
index a94e790..8b4589d 100755
|
||
|
--- a/build/unix/makehtml.sh
|
||
|
+++ b/build/unix/makehtml.sh
|
||
12 years ago
|
@@ -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
|
||
9 years ago
|
- $ROOT -n -l -b -q hsimple.C
|
||
|
+ $ROOT -n -l -b -q hsimple.C && exit 1
|
||
12 years ago
|
fi
|
||
|
cd tree
|
||
|
# we need tutorials/tree/cernstaff.root
|
||
|
if [ ! -f cernstaff.root ]; then
|
||
9 years ago
|
- $ROOT -n -l -b -q cernbuild.C
|
||
|
+ $ROOT -n -l -b -q cernbuild.C || exit 1
|
||
12 years ago
|
fi
|
||
|
cd $dir
|
||
|
|
||
9 years ago
|
@@ -20,7 +20,7 @@ echo ""
|
||
12 years ago
|
|
||
|
# To generate the full documentation, we do need to
|
||
|
# use the graphics engine, so do not use '-b'.
|
||
9 years ago
|
-$ROOT -n -l <<makedoc
|
||
|
+$ROOT -n -l <<makedoc || exit 1
|
||
12 years ago
|
THtml h;
|
||
|
h.LoadAllLibs();
|
||
|
h.MakeAll();
|