Commit 1e66a071 authored by POGODALLA Sylvain's avatar POGODALLA Sylvain

Modification of the configuration script to allow for installing the

acg.el file

M    trunk/configure
M    trunk/Makefile.in
M    trunk/README
M    trunk/config/configure.ac
M    trunk/INSTALL
parent d55a3c01
......@@ -109,6 +109,18 @@ copy the following lines in your .emacs
where EMACS_DIR_PATH is the path of a directory where you copied acg.el (typically)
Note:
+ you can install the acg.el file into any directory
specifying the EMACS_PATH while invoking the ./configure
command.
Default is PREFIX/share/emacs/site-lisp/acg
+ If you installed acgtk using opam, then the default path is
OPAM_REPOSITORY/OCAML_VERSION/share/acg
** Site distribution:
......
......@@ -33,6 +33,8 @@ exec_prefix = @exec_prefix@
ACG_DIR=src/scripting
ACGC_DIR=src/acg-data
EMACS_DIR=@emacs_dir@
byte: acg acgc
opt: acg.opt acgc.opt
......@@ -69,6 +71,13 @@ install:
uninstall:
for file in $(BINARIES); do if test -x @bindir@/$$file ; then rm @bindir@/$$file ; fi ; done
install-emacs:
mkdir -p $(EMACS_DIR) && cp emacs/acg.el $(EMACS_DIR)/.
uninstall-emacs:
rm $(EMACS_DIR)/acg.el
rm -r $(EMACS_DIR)
# Part for the auto configuration
......
......@@ -112,7 +112,9 @@ Type CTRL-D to exit from the program.
There is an ACG emacs mode (acg.el) in the emacs directory.
Look at the INSTALL file to see how to install it.
Look at the INSTALL file to see how to install it and where you can
find the acg.el file if automatically installed (in particular using
opam).
It's main feature is to be loaded when editing an acg data file (with
signatures and lexicons). It is automatically loaded for files with a
......
......@@ -208,6 +208,13 @@ fi
AC_MSG_RESULT($OCAMLP4 calls will be done with the $CAMLP4_LIB library)
AC_ARG_VAR(EMACS_PATH,[Directory where to installt the emacs acg-mode. Default is PREFIX/share/emacs/site-lisp/acg.])
if test -n "$EMACS_PATH" ; then
AC_SUBST(emacs_dir,$EMACS_PATH)
else
AC_SUBST(emacs_dir,$(prefix)/share/emacs/site-lisp/acg)
fi
############################
......
......@@ -591,6 +591,8 @@ OCAMLP4_LOC
OCAML09WARNINGS
TYPES
CAMLP4_LIB
emacs_dir
EMACS_PATH
BOLT_LEVEL
BOLT_PP
BOLT_LIB
......@@ -662,7 +664,8 @@ host_alias
target_alias
DYPGEN_PATH
DYPGENLIB_PATH
BOLTLIB_PATH'
BOLTLIB_PATH
EMACS_PATH'
# Initialize some variables set by options.
......@@ -1283,6 +1286,8 @@ Some influential environment variables:
BOLTLIB_PATH
Directory where to find the bolt library if not in a standard
location
EMACS_PATH Directory where to installt the emacs acg-mode. Default is
PREFIX/share/emacs/site-lisp/acg.
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
......@@ -2932,6 +2937,15 @@ $as_echo "$OCAMLP4 calls will be done with the $CAMLP4_LIB library" >&6; }
if test -n "$EMACS_PATH" ; then
emacs_dir=$EMACS_PATH
else
emacs_dir=$(prefix)/share/emacs/site-lisp/acg
fi
############################
# substitutions to perform
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment