[nongnu] externals/caml 9d5dbfb 131/197: - Replaced setq by add-to-list in README

[Stefan Monnier]

branch: externals/caml
commit 9d5dbfb3627a8d56ef377498ebe283c7e98a2b00
Author: Didier Rémy <Didier.Remy@inria.fr>
Commit: Didier Rémy <Didier.Remy@inria.fr>

     - Replaced setq by add-to-list in README
     - Fixed detection of site-lisp in Makefile (to fail when ambiguous).
    
    
    git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11190 
f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
---
 Makefile | 14 ++++++++------
 README   | 15 ++++++++-------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 125e9eb..77aa0c6 100644
--- a/Makefile
+++ b/Makefile
@@ -42,13 +42,15 @@ COMPILECMD=(progn \
 install:
        @if test "$(EMACSDIR)" = ""; then \
          set xxx `($(EMACS) --batch --eval "(mapcar 'print load-path)") \
-                  2>/dev/null | \
-                  sed -n -e '/\/site-lisp/s/"//gp'`; \
-         if test "$$2" = ""; then \
-           echo "Cannot determine Emacs site-lisp directory"; \
-           exit 2; \
-         fi; \
+                               2>/dev/null | \
+                  sed -n -e 's/^"\(.*\/site-lisp\).*/\1/gp' | \
+                  sort -u`; \
+         if test "$$2" = "" -o "$$3" != ""; then \
+           echo "Cannot determine Emacs site-lisp directory:"; \
+            shift; while test "$$1" != ""; do echo "\t$$1"; shift; done; \
+         else \
          $(MAKE) EMACSDIR="$$2" simple-install; \
+         fi; \
        else \
          $(MAKE) simple-install; \
        fi
diff --git a/README b/README
index 7dedfc8..708909b 100644
--- a/README
+++ b/README
@@ -12,17 +12,18 @@ This package is based on the original caml-mode for 
caml-light by
 Xavier Leroy, extended with indentation by Ian Zimmerman. For details
 see README.itz, which is the README from Ian Zimmerman's package.
 
-To use it, just put the .el files in your path, and add the following
-three lines in your .emacs.
+To use it, just put the .el files in your emacs load path, and add the
+following three lines in your .emacs.
 
-    (setq auto-mode-alist
-          (cons '("\\.ml[iylp]?$" . caml-mode) auto-mode-alist))
+    (add-to-list 'auto-mode-alist '("\\.ml[iylp]?$" . caml-mode))
     (autoload 'caml-mode "caml" "Major mode for editing Caml code." t)
     (autoload 'run-caml "inf-caml" "Run an inferior Caml process." t)
+    (autoload 'camldebug "camldebug" "Run ocamldebug on program." t)
 
-I added camldebug.el from the original distribution, since there will
-soon be a debugger for OCaml, but I do not know enough about
-it.
+or put the .el files in, eg. "/usr/share/emacs/site-lisp/caml-mode/"
+and add the following line in addtion to the four lines above:
+
+    (add-to-list 'load-path "/usr/share/emacs/site-lisp/caml-mode")
 
 To install the mode itself, edit the Makefile and do