aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar David Aspinall <da@inf.ed.ac.uk>2007-03-04 13:31:56 +0000
committerGravatar David Aspinall <da@inf.ed.ac.uk>2007-03-04 13:31:56 +0000
commit365deef3a6fac0821e81ae691b92f2af386611d9 (patch)
treeba4bff26139f3adfb7590bfc7f03545ba424fc63 /Makefile
parent9b0c78ede03e3dc6654e54cd0c66c7086a85ffb2 (diff)
Choose Emacs instead of XEmacs
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 7b2d2c97..013fa011 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
# Set this to "emacs" or "xemacs" according to your version of Emacs.
# NB: this is also used to set default install path names below.
-EMACS=$(shell if [ -z "`which xemacs`" ]; then echo emacs; else echo xemacs; fi)
+EMACS=$(shell if [ -z "`which emacs`" ]; then echo xemacs; else echo emacs; fi)
# We default to /usr rather than /usr/local because installs of
# desktop and doc files under /usr/local are unlikely to work with
@@ -221,10 +221,10 @@ install-doc: doc.info doc.pdf
for f in ${DOC_EXAMPLES}; do mkdir -p ${DOCDIR}/`dirname $$f`; cp -pf $$f ${DOCDIR}/$$f; done
doc: FORCE
- (cd doc; make $*)
+ (cd doc; make EMACS=$(EMACS) $*)
doc.%: FORCE
- (cd doc; make $*)
+ (cd doc; make EMACS=$(EMACS) $*)
##
## scripts: try to patch bash and perl scripts with correct paths