From 7fd09ee1bb89eefccfd976de0621422edce0d7f2 Mon Sep 17 00:00:00 2001
From: Damien Doligez <damien.doligez-inria.fr>
Date: Thu, 9 Feb 2012 18:05:03 +0000
Subject: [PATCH] avoid depending on "make opt"; set correct dependency on
 VERSION

git-svn-id: http://caml.inria.fr/svn/ocamldoc/trunk@12141 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 manual/manual/Makefile         | 6 +++---
 manual/manual/library/Makefile | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manual/manual/Makefile b/manual/manual/Makefile
index 8f74ebdad..e76bc7d0c 100644
--- a/manual/manual/Makefile
+++ b/manual/manual/Makefile
@@ -5,7 +5,7 @@ TEXINPUTS=.:..:../refman:../library:../cmds:../tutorials:../../styles:
 TEXFONTS=../../styles:
 RELEASE=$$HOME/release/$${RELEASENAME}
 SRC=../../release
-OCAMLDOC=$(SRC)/ocamldoc/ocamldoc.opt -hide Pervasives
+OCAMLDOC=$(SRC)/ocamldoc/ocamldoc -hide Pervasives
 HEVEA=hevea
 HACHA=hacha
 INFO=-fix -exec xxdate.exe -info -w 79
@@ -117,8 +117,8 @@ release:
 .etex.tex:
 	../tools/texquote2 < $*.etex > $*.tex
 
-version.tex: $(SRC)/stdlib/sys.ml
-	sed -n -e 's/^\([0-9]*\.[0-9]*\).*$$/\\def\\ocamlversion{\1}/p' $(SRC)/VERSION > version.tex
+version.tex: $(SRC)/VERSION
+	sed -n -e '1s/^\([0-9]*\.[0-9]*\).*$$/\\def\\ocamlversion{\1}/p' $(SRC)/VERSION > version.tex
 
 warnings.tex: $(SRC)/utils/warnings.ml $(SRC)/ocamlc
 	$(SRC)/boot/ocamlrun $(SRC)/ocamlc -warn-help | sed -e 's/^ *\([0-9A-Z][0-9]*\)\(.*\)/\\item[\1] \2/' > warnings.tex
diff --git a/manual/manual/library/Makefile b/manual/manual/library/Makefile
index 06ca160ed..45073f76d 100644
--- a/manual/manual/library/Makefile
+++ b/manual/manual/library/Makefile
@@ -44,12 +44,12 @@ CSLDIR=../../../release
 
 VPATH=.:$(CSLDIR)/stdlib:$(CSLDIR)/otherlibs/unix:$(CSLDIR)/otherlibs/str:$(CSLDIR)/otherlibs/num:$(CSLDIR)/otherlibs/graph:$(CSLDIR)/otherlibs/threads:$(CSLDIR)/otherlibs/dynlink:$(CSLDIR)/otherlibs/bigarray
 
-all: libs 
+all: libs
 
 libs: $(FILES)
 
 $(INTF): $(MLIS)
-	$(CSLDIR)/ocamldoc/ocamldoc.opt -latex -I $(CSLDIR)/stdlib  \
+	$(CSLDIR)/ocamldoc/ocamldoc -latex -I $(CSLDIR)/stdlib  \
 	-I $(CSLDIR)/otherlibs/bigarray \
 	-I $(CSLDIR)/otherlibs/dynlink \
 	-I $(CSLDIR)/otherlibs/graph \