diff options
author | Carl Worth <cworth@cworth.org> | 2010-04-06 10:35:20 -0700 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2010-04-06 14:36:31 -0700 |
commit | a5ed8c68f6db37d3866088a9770447eba6833109 (patch) | |
tree | 3710209c13f3f77c2cc7628bf43c61e954b4ff5b /configure | |
parent | f89b3d16db90be99c3097c8dac0d95930cdd1f1d (diff) |
Makefile: Eliminate the "make install-emacs" target.
Instead, simply byte-compile the emacs source files as part of "make"
and install them as part of "make install". The byte compilation is
made conditional on the configure script finding the emacs binary.
That way, "make; make install" will still work for someone that doesn't
have emacs installed, (which was the only reason we had made a separate
"make install-emacs" target in the first place).
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -175,6 +175,15 @@ else emacs_lispdir='$(prefix)/share/emacs/site-lisp' fi +printf "Checking if emacs is available... " +if emacs --quick --batch > /dev/null 2>&1; then + printf "Yes.\n" + have_emacs=1 +else + printf "No (so will not byte-compile emacs code)\n" + have_emacs=0 +fi + if [ $errors -gt 0 ]; then cat <<EOF @@ -300,6 +309,9 @@ libdir = ${LIBDIR:=\$(prefix)/lib} # The directory to which emacs lisp files should be installed emacs_lispdir=${emacs_lispdir} +# Whether there's an emacs binary available for byte-compiling +HAVE_EMACS = ${have_emacs} + # The directory to which desktop files should be installed desktop_dir = \$(prefix)/share/applications |