Merge pull request #1449 from OCamlPro/1.1

Remove opam-check manpage and need for pandoc
ocaml · Jun 13, 2014 · b66d490 · b66d490
2 parents d6037ff + 12a5e56
commit b66d490
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 49 deletions.
diff --git a/.gitignore b/.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,11 @@ 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
diff --git a/configure b/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

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

diff --git a/doc/Makefile b/doc/Makefile
@@ -27,9 +27,6 @@ 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
 
 tutorials:
 	$(MAKE) -C tutorials

diff --git a/doc/man-ext/opam-check.md.in b/doc/man-ext/opam-check.md.in
diff --git a/doc/man/opam-check.1 b/doc/man/opam-check.1
diff --git a/opam.install b/opam.install
@@ -13,7 +13,6 @@ man: [
   "?doc/man/opam-switch.1" {"man1/opam-switch.1"}
   "?doc/man/opam-update.1" {"man1/opam-update.1"}
   "?doc/man/opam-admin.1" {"man1/opam-admin.1"}
-  "?doc/man/opam-check.1" {"man1/opam-check.1"}
   "?doc/man/opam-info.1" {"man1/opam-info.1"}
   "?doc/man/opam-list.1" {"man1/opam-list.1"}
   "?doc/man/opam-remote.1" {"man1/opam-remote.1"}