Merge pull request #1444 from OCamlPro/1.1

1.1 update (fix configure, install manpages, and bump version to 1.1.2)
ocaml · Jun 12, 2014 · d6037ff · d6037ff
2 parents 02863c9 + 35bd23a
commit d6037ff
Show file tree

Hide file tree

Showing 27 changed files with 62 additions and 805 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,4 @@
-1.1.1-2
+1.1.2
 * Backport the new OCamlMakefile-based build system from 1.2
 
 1.1.1

diff --git a/Makefile b/Makefile
@@ -68,6 +68,10 @@ tests-%: opam opam-admin opam-check
 doc: opam-lib
 	$(MAKE) -C doc
 
+.PHONY: man
+man: opam-lib
+	$(MAKE) -C doc $@
+
 configure: configure.ac m4/*.m4
 	aclocal -I m4
 	autoconf
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-.1.1-2
+.1.2
     * Backport the new OCamlMakefile-based build system from 1.2
 .1.1
@@ Expand Down @@