Install midizap-mode automatically if Emacs is found during installation. Update the documentation.

Makefile

@@ -7,6 +7,12 @@ bindir=$(DESTDIR)$(prefix)/bin
 mandir=$(DESTDIR)$(prefix)/share/man/man1
 datadir=$(DESTDIR)/etc
 
+# See whether emacs is installed and try to guess its installation prefix.
+emacs_prefix = $(patsubst %/bin/emacs,%,$(shell which emacs 2>/dev/null))
+ifneq ($(strip $(emacs_prefix)),)
+elispdir = $(emacs_prefix)/share/emacs/site-lisp
+endif
+
 # Check to see whether we have Jack installed. Needs pkg-config.
 JACK := $(shell pkg-config --libs jack 2>/dev/null)
 
@@ -27,6 +33,12 @@ install: all
 	install -d $(bindir) $(datadir) $(mandir)
 	install midizap $(bindir)
 	install -m 0644 example.midizaprc $(datadir)/midizaprc
+ifneq ($(elispdir),)
+# If emacs was found, or elispdir was specified manually, install
+# midizap-mode.el into the elispdir directory.
+	install -d $(DESTDIR)$(elispdir)
+	install -m 0644 midizap-mode.el $(DESTDIR)$(elispdir)
+endif
 # If present, the manual page will be installed along with the program.
 ifneq ($(findstring midizap.1, $(INSTALL_TARGETS)),)
 	install -m 0644 midizap.1 $(mandir)

README.md

@@ -56,7 +56,7 @@ First, make sure that you have the required dependencies installed. The program
 
 Then just run `make` and `sudo make install`. This installs the example.midizaprc file as /etc/midizaprc, and the midizap program and the manual page in the default install location. Usually this will be under /usr/local, but the installation prefix can be changed with the `prefix` variable in the Makefile. Also, package maintainers can use the `DESTDIR` variable to install into a staging directory for packaging purposes.
 
-For users of the Emacs text editor we provide a midizap mode which does syntax-highlighting of midizaprc files and also lets you launch a midizap session in an Emacs buffer. The mode isn't installed automatically, but you can do this manually by copying the midizap-mode.el file to a directory on your Emacs load-path; please check midizap-mode.el in the sources for more detailed instructions.
+For users of the Emacs text editor we provide a midizap mode which does syntax-highlighting of midizaprc files and also lets you launch a midizap session in an Emacs buffer. If Emacs was found during installation, the midizap-mode.el file is installed into the share/emacs/site-lisp directory along with the other files. The Makefile tries to guess the proper installation prefix, but if necessary you can also set the `elispdir` variable or copy the file manually to a directory on your Emacs load-path. Please check midizap-mode.el for more detailed instructions.
 
 # Configuration File
 

midizap-mode.el.in

@@ -27,20 +27,17 @@
 (require 'comint)
 
 (defconst midizap-keywords
-  (append
-   (list
-    "DEBUG_REGEX" "DEBUG_STROKES" "DEBUG_KEYS" "DEBUG_MIDI"
-    "MIDI_OCTAVE" "JACK_NAME" "JACK_PORTS"
-    "JACK_IN" "JACK_IN1" "JACK_IN2"
-    "JACK_OUT" "JACK_OUT1" "JACK_OUT2"
-    "PASSTHROUGH" "SYSTEM_PASSTHROUGH"
-    "RELEASE" "SHIFT" "SHIFT1" "SHIFT2" "SHIFT3" "SHIFT4"
-    "CLASS" "TITLE"
-    )
-   (list
+  (list
+   "DEBUG_REGEX" "DEBUG_STROKES" "DEBUG_KEYS" "DEBUG_MIDI"
+   "MIDI_OCTAVE" "JACK_NAME" "JACK_PORTS"
+   "JACK_IN" "JACK_IN1" "JACK_IN2"
+   "JACK_OUT" "JACK_OUT1" "JACK_OUT2"
+   "PASSTHROUGH" "SYSTEM_PASSTHROUGH"
+   "RELEASE" "SHIFT" "SHIFT1" "SHIFT2" "SHIFT3" "SHIFT4"
+   "CLASS" "TITLE"
     ;; keysyms
 
-    )))
+   ))
 
 ;;;###autoload
 (define-generic-mode 'midizap-mode