PageRenderTime 48ms CodeModel.GetById 24ms RepoModel.GetById 0ms app.codeStats 0ms

/app-doc/root-docs/files/root-docs-5.34.01-makehtml.patch

https://bitbucket.org/YueRen/lmnd-prefix
Patch | 51 lines | 47 code | 4 blank | 0 comment | 0 complexity | 93c7f1bb312a360df4eaf2c8a67b6eb6 MD5 | raw file
Possible License(s): AGPL-1.0, GPL-2.0, MIT, LGPL-2.0, GPL-3.0, AGPL-3.0, MPL-2.0-no-copyleft-exception, Unlicense, LGPL-3.0, CC0-1.0, Apache-2.0, BSD-3-Clause, LGPL-2.1, CC-BY-SA-3.0 
    

  1. --- root/Makefile.orig	2012-07-13 13:42:46.000000000 +0400
    2. 

  2. +++ root/Makefile	2012-07-22 00:15:03.282994389 +0400
    3. 

  3. @@ -1087,16 +1087,7 @@
    4. 

  4.  
    5. 

  5.  ifeq ($(BUILDX11),yes)
    6. 

  6.  ifeq ($(BUILDASIMAGE),yes)
    7. 

  7. -html: rootexecs postbin changelog releasenotes
    8. 

  8. -ifneq ($(USECONFIG),FALSE)
    9. 

  9. -	@if [ "x`which root.exe`" != "x$(DESTDIR)$(BINDIR)/root.exe" ] \
    10. 

  10. -	  || [ "`which root.exe`" -ot "bin/root.exe" ]; then \
    11. 

  11. -	  echo 'ERROR: root.exe has not been installed by this build.'; \
    12. 

  12. -	  echo '       Run "make install" before running "make html".'; \
    13. 

  13. -	  exit 1; \
    14. 

  14. -	fi
    15. 

  15. -endif
    16. 

  16. -	@$(MAKELOGHTML)
    17. 

  17. +html: compiledata releasenotes
    18. 

  18.  	@$(MAKEHTML)
    19. 

  19.  else
    20. 

  20.  html:
    21. 

  21. --- root/build/unix/makehtml.sh.orig	2012-06-28 11:33:36.000000000 +0400
    22. 

  22. +++ root/build/unix/makehtml.sh	2012-07-22 00:18:58.705804436 +0400
    23. 

  23. @@ -1,16 +1,16 @@
    24. 

  24.  #! /bin/sh
    25. 

  25.  
    26. 

  26.  dir=`pwd`
    27. 

  27. -ROOT=$dir/bin/root
    28. 

  28. +ROOT=root
    29. 

  29.  cd tutorials
    30. 

  30.  # we need tutorials/hsimple.root
    31. 

  31.  if [ ! -f hsimple.root ]; then
    32. 

  32. -   $ROOT -l -b -q hsimple.C
    33. 

  33. +   $ROOT -l -b -q hsimple.C && exit 1
    34. 

  34.  fi
    35. 

  35.  cd tree
    36. 

  36.  # we need tutorials/tree/cernstaff.root
    37. 

  37.  if [ ! -f cernstaff.root ]; then
    38. 

  38. -   $ROOT -l -b -q cernbuild.C
    39. 

  39. +   $ROOT -l -b -q cernbuild.C || exit 1
    40. 

  40.  fi
    41. 

  41.  cd $dir
    42. 

  42.  
    43. 

  43. @@ -20,7 +20,7 @@
    44. 

  44.  
    45. 

  45.  # To generate the full documentation, we do need to
    46. 

  46.  # use the graphics engine, so do not use '-b'.
    47. 

  47. -$ROOT -l <<makedoc
    48. 

  48. +$ROOT -l <<makedoc || exit 1
    49. 

  49.      THtml h;
    50. 

  50.      h.LoadAllLibs();
    51. 

  51.      h.MakeAll();
    52. 

  52.