Cleanup manpage generation

* removed version-controlled manpages (thanks to cmdliner, they are generated without external dependencies)
* removed opam-check manpage (opam-check is not even installed, and it was almost empty)
* added opam-installer and missing opam-admin manpages
* updated .gitignore

.gitignore

@@ -14,11 +14,16 @@ src_ext/*.tar.gz
 *.annot
 *.tar.gz
 *~
+.#*
 ocp-build.root
 ocp-build.root.old
 ocp-get
 ocp-get-server
 ocp-build.root.old.old
+# debug files
+*.log
+*.cudf
+*.dot
 # Generated files:
 *.cmo
 *.cmx
@@ -33,7 +38,6 @@ META
 Makefile.config
 config.log
 config.status
-doc/man-ext/opam-check.md
 src/core/opamGitVersion.ml
 src/core/opamScript.ml
 src/core/opamVersion.ml
@@ -51,3 +55,12 @@ src/opamlfind
 ._bcdi
 aclocal.m4
 autom4te.cache
+# doc
+doc/dev-manual/*aux
+doc/dev-manual/*.html
+doc/dev-manual/*toc
+doc/html
+doc/man-html
+doc/tutorials/opam.wiki
+doc/dev-manual/*.out
+doc/man

Makefile

@@ -62,11 +62,11 @@ tests-%: opam opam-admin opam-check
 	$(MAKE) -C tests $*
 
 .PHONY: doc
-doc: opam-lib
+doc: all
 	$(MAKE) -C doc
 
 .PHONY: man
-man: opam-lib
+man: opam opam-admin opam-installer
 	$(MAKE) -C doc $@
 
 configure: configure.ac m4/*.m4

configure

@@ -4499,7 +4499,7 @@ if test "$prefix" = "NONE"; then
   prefix=$ac_default_prefix
 fi
 
-ac_config_files="$ac_config_files Makefile.config META src/core/opamVersion.ml doc/man-ext/opam-check.md"
+ac_config_files="$ac_config_files Makefile.config META src/core/opamVersion.ml"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5210,7 +5210,6 @@ do
     "Makefile.config") CONFIG_FILES="$CONFIG_FILES Makefile.config" ;;
     "META") CONFIG_FILES="$CONFIG_FILES META" ;;
     "src/core/opamVersion.ml") CONFIG_FILES="$CONFIG_FILES src/core/opamVersion.ml" ;;
-    "doc/man-ext/opam-check.md") CONFIG_FILES="$CONFIG_FILES doc/man-ext/opam-check.md" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac

configure.ac

@@ -98,7 +98,6 @@ AC_CONFIG_FILES(
   Makefile.config
   META
   src/core/opamVersion.ml
-  doc/man-ext/opam-check.md
 )
 AC_OUTPUT
 

doc/Makefile

@@ -5,20 +5,26 @@ BINDIR = $(dir $(OPAM))
 SRCDIR = $(wildcard ../src/*)
 
 TOPICS  = $(shell $(OPAM) help topics)
+
 ifndef OPAM_ADMIN
   OPAM_ADMIN = $(BINDIR)/opam-admin
 endif
-TOPICS_ADMIN = check make
+TOPICS_ADMIN = check make depexts libs stats
 HELPFMT = --help=groff
 
+ifndef OPAM_INSTALLER
+  OPAM_INSTALLER = $(BINDIR)/opam-installer
+endif
+
 SRCEXTDIR = ../src_ext/lib
 INCLUDE = $(patsubst %,-I %,$(SRCDIR) $(SRCEXTDIR))
 
 .PHONY: man html dev-manual tutorials
 all: man tutorials dev html
 
 man:
-	rm -f man/*
+	rm -rf man
+	mkdir -p man
 	$(OPAM) $(HELPFMT) > man/opam.1
 	for i in $(TOPICS); do\
 	  $(OPAM) $$i $(HELPFMT) > man/opam-$$i.1;\
@@ -27,9 +33,7 @@ man:
 	for i in $(TOPICS_ADMIN); do\
 	  $(OPAM_ADMIN) $$i $(HELPFMT) > man/opam-admin-$$i.1;\
 	done
-	for i in opam-check; do\
-	  pandoc -s -t man man-ext/$$i.md -o man/$$i.1;\
-	done
+	$(OPAM_INSTALLER) $(HELPFMT) > man/opam-installer.1
 
 tutorials:
 	$(MAKE) -C tutorials
@@ -39,4 +43,4 @@ dev:
 
 html:
 	mkdir -p html/
-	ocamldoc $(INCLUDE) ../src/*/*.mli ../src/*/*.ml -html -d html/
+	ocamldoc $(INCLUDE) ../src/*/*.mli ../src/*/*.ml -html -d html/ || true