diff -urN ocaml-3.07/emacs/Makefile ocaml-3.07.zm/emacs/Makefile
--- ocaml-3.07/emacs/Makefile	2003-08-29 17:38:28.000000000 +0200
+++ ocaml-3.07.zm/emacs/Makefile	2003-11-03 20:48:40.000000000 +0100
@@ -28,7 +28,7 @@
 
 install:
 	@if test "$(EMACSDIR)" = ""; then \
-          set xxx `($(EMACS) --batch --eval "(mapcar 'print load-path)") \
+          set xxx `($(EMACS) -batch -l -f -eval "(mapcar 'print load-path)") \
                    2>/dev/null | \
                    sed -n -e '/\/site-lisp/s/"//gp'`; \
           if test "$$2" = ""; then \
@@ -49,7 +49,7 @@
 	if test -d $(EMACSDIR); then : ; else mkdir -p $(EMACSDIR); fi
 	cp $(FILES) $(EMACSDIR)
 	if [ -z "$(NOCOMPILE)" ]; then \
-	  cd $(EMACSDIR); $(EMACS) --batch --eval '$(COMPILECMD)'; \
+	  cd $(EMACSDIR); $(EMACS) -batch -l -f -eval '$(COMPILECMD)'; \
 	fi
 
 ocamltags:	ocamltags.in
diff -urN ocaml-3.07/emacs/Makefile~ ocaml-3.07.zm/emacs/Makefile~
--- ocaml-3.07/emacs/Makefile~	1970-01-01 01:00:00.000000000 +0100
+++ ocaml-3.07.zm/emacs/Makefile~	2003-08-29 17:38:28.000000000 +0200
@@ -0,0 +1,63 @@
+# $Id$
+
+include ../config/Makefile
+
+# Files to install
+FILES=	caml-font.el caml-hilit.el caml.el camldebug.el \
+	inf-caml.el caml-compat.el caml-help.el caml-types.el \
+	caml-xemacs.el caml-emacs.el
+
+# Where to install. If empty, automatically determined.
+#EMACSDIR=
+
+# Name of Emacs executable
+EMACS=emacs
+
+# Where to install ocamltags script
+SCRIPTDIR = $(BINDIR)
+
+# Command for byte-compiling the files
+COMPILECMD=(progn \
+              (setq load-path (cons "." load-path)) \
+              (byte-compile-file "caml-xemacs.el") \
+	      (byte-compile-file "caml-emacs.el") \
+              (byte-compile-file "caml.el") \
+              (byte-compile-file "inf-caml.el") \
+              (byte-compile-file "caml-help.el") \
+              (byte-compile-file "camldebug.el"))
+
+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; \
+          $(MAKE) EMACSDIR="$$2" simple-install; \
+        else \
+          $(MAKE) simple-install; \
+        fi
+
+# install the .el files, but do not compile them.
+install-el:
+	$(MAKE) NOCOMPILE=true install
+
+simple-install:
+	@echo "Installing in $(EMACSDIR)..."
+	if test -d $(EMACSDIR); then : ; else mkdir -p $(EMACSDIR); fi
+	cp $(FILES) $(EMACSDIR)
+	if [ -z "$(NOCOMPILE)" ]; then \
+	  cd $(EMACSDIR); $(EMACS) --batch --eval '$(COMPILECMD)'; \
+	fi
+
+ocamltags:	ocamltags.in
+	sed -e 's:@EMACS@:$(EMACS):' ocamltags.in >ocamltags
+	chmod a+x ocamltags
+
+install-ocamltags: ocamltags
+	cp ocamltags $(SCRIPTDIR)/ocamltags
+
+clean:
+	rm -f ocamltags *~ #*#