Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Still moving around GODI package.

  • Loading branch information...
commit f44b225d3279d88e9af91e6662ad966c0ea5e633 1 parent 9a0e40d
David Teller authored
Showing with 36 additions and 17 deletions.
  1. +4 −0 ChangeLog
  2. +5 −2 Makefile.in
  3. +14 −4 README
  4. +13 −11 configure.ac
View
4 ChangeLog
@@ -1,5 +1,9 @@
2008-11-10 David Teller <David.Teller@univ-orleans.fr>
+ * configure.ac: [OCAMLPKG_camomile] now substituted
+
+ * README: added [opt] and [instdoc]
+
* Makefile.in: [INSTALLATION] added
* Makefile.in: [DEST_TOP] now uses the directory of camomile
View
7 Makefile.in
@@ -25,6 +25,9 @@ VERSION = @VERSION@
# Typical value: "GODI" (GODI)
INSTALLATION =
+prefix = @prefix@
+PACKAGE= @PACKAGE@
+
# place where your on-line help files are stored
# if you want on-line help, you will need to invoke make as
# make DOCDIR="/some/where/"
@@ -33,7 +36,7 @@ INSTALLATION =
ifeq ($(INSTALLATION), GODI)
DOCDIR = $(shell ocamlfind printconf destdir)/../../../doc/godi-batteries
else
-DOCDIR = @DOCDIR@
+DOCDIR = @docdir@
endif
# command used to trigger the browser
@@ -67,7 +70,7 @@ endif
DEST_TOP =
ifeq ($(DESTDIR),)
-DEST_TOP = $(shell @OCAMLFIND@ query @OCAMLPKG_camomile@)/../batteries/top.ml
+DEST_TOP = $(shell @OCAMLFIND@ query @OCAMLPKG_camomile@ )/../batteries/top.ml
else
DEST_TOP = $(DESTDIR)/batteries/top.ml
endif
View
18 README
@@ -27,16 +27,26 @@ You will need
If you're working from the git tree, you'll need:
* autoconf
-and you'll have to do
+and you'll have to first run
$ autoconf
to create the configure script.
-To install the full version of OCaml Batteries Included, execute
+To install the full version of OCaml Batteries Included in the default
+directory (/usr/local/), execute
$ ./configure
- $ make all install
+ $ make all opt install instdoc
+
+If you wish to install to a directory other than the default directory,
+execute
+
+ $ ./configure --prefix=/path/to/some/other/directory/
+ $ make all opt install instdoc
+
+Be patient, documentation generation may take more than 15 minutes.
+If you do not want the documentation generation, remove "instdoc"
+from the previous commands.
-Be patient, documentation generation takes several minutes.
*** Using Batteries Included ***
View
24 configure.ac
@@ -61,6 +61,8 @@ if test -z "$OCAMLPKG_camomile" ; then
AC_MSG_ERROR([Cannot find Camomile])
exit 1
fi
+AC_SUBST(OCAMLPKG_camomile)
+
AC_CHECK_OCAML_PKG(zip, OCAMLPKG_zip)
# Camlzip has different Findlib-level names on, e.g., Debian and GODI
if test -z "$OCAMLPKG_zip" ; then
@@ -104,17 +106,17 @@ if test "$BROWSER_COMMAND" = "yes" ; then
fi
AC_SUBST(BROWSER_COMMAND)
-DEFAULT_DOCDIR="`pwd`/doc/batteries"
-AC_ARG_WITH(
- docroot,
- [ --with-docroot=PATH set documentation root
- default: "$PWD/doc/batteries"],
- DOCDIR=$withval,
- DOCDIR=$DEFAULT_DOCDIR)
-if test "$DOCDIR" = "yes" ; then
- AC_MSG_ERROR([--with-docroot requires an argument])
- exit 1
-fi
+#DEFAULT_DOCDIR="`pwd`/doc/batteries"
+#AC_ARG_WITH(
+# docroot,
+# [ --with-docroot=PATH set documentation root
+# default: "$PWD/doc/batteries"],
+# DOCDIR=$withval,
+# DOCDIR=$DOCDIR)
+#if test "$DOCDIR" = "yes" ; then
+# AC_MSG_ERROR([--with-docroot requires an argument])
+# exit 1
+#fi
AC_SUBST(DOCDIR)
# fill output templates
Please sign in to comment.
Something went wrong with that request. Please try again.