aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--FAQ4
-rw-r--r--Makefile6
2 files changed, 5 insertions, 5 deletions
diff --git a/FAQ b/FAQ
index 0b97a8a9..34962cef 100644
--- a/FAQ
+++ b/FAQ
@@ -73,8 +73,8 @@ Q. Proof General fails to load with an error message on start-up:
What's wrong?
-A. We distribute .elcs for XEmacs, so you will have to delete
- them and (optionally) recompile for GNU Emacs. Using the Makefile:
+A. We distribute .elcs for GNU Emacs, so you will have to delete
+ them and (optionally) recompile for XEmacs. Using the Makefile:
Use 'make clean' to remove all .elc files.
Use 'make compile' to recompile .elc files.
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