PageRenderTime 43ms CodeModel.GetById 9ms RepoModel.GetById 1ms app.codeStats 0ms

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

http://github.com/funtoo/portage
Patch | 52 lines | 46 code | 6 blank | 0 comment | 0 complexity | 737489417ff6cf6d049bf81f427ef502 MD5 | raw file
Possible License(s): Apache-2.0, AGPL-1.0, LGPL-2.1, MIT, CC-BY-SA-3.0, LGPL-2.0, Unlicense, AGPL-3.0, CC0-1.0, BSD-3-Clause, GPL-2.0, LGPL-3.0, MPL-2.0-no-copyleft-exception, GPL-3.0 
    

  1. --- root/Makefile.orig	2012-05-30 00:50:46.000000000 +0400
    2. 

  2. +++ root/Makefile	2012-05-30 00:51:05.839679686 +0400
    3. 

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

  4.  releasenotes:
    5. 

  5.  	@$(MAKERELNOTES)
    6. 

  6.  
    7. 

  7. -html: $(ROOTEXE) 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.  
    20. 

  20.  # Use DESTDIR to set a sandbox prior to calling "make install", e.g.:
    21. 

  21. --- root/build/unix/makehtml.sh.orig	2012-06-18 06:44:59.000000000 +0400
    22. 

  22. +++ root/build/unix/makehtml.sh	2012-06-18 19:39:41.262064654 +0400
    23. 

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

  24.  #! /bin/sh
    25. 

  25.  
    26. 

  26. -ROOT=bin/root.exe
    27. 

  27. +ROOT=root.exe
    28. 

  28.  
    29. 

  29.  dir=`pwd`
    30. 

  30.  cd tutorials
    31. 

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

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

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

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

  35.  fi
    36. 

  36.  cd tree
    37. 

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

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

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

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

  41.  fi
    42. 

  42.  cd $dir
    43. 

  43.  
    44. 

  44. @@ -19,7 +19,7 @@
    45. 

  45.  echo "Generating doc in directory htmldoc/..."
    46. 

  46.  echo ""
    47. 

  47.  
    48. 

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

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

  50.      THtml h;
    51. 

  51.      h.LoadAllLibs();
    52. 

  52.      h.MakeAll();
    53. 

  53.