Skip to content

Commit e4418c3

Browse files
committed
Rename haskell-site-file to haskell-mode-autoloads
And update the instructions in the README This matches the convention used by the elisp package system which generates a `haskell-mode-autoloads.el` file during package install. This is related to #156
1 parent 5a3e0dd commit e4418c3

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ELFILES = \
3535
inf-haskell.el
3636

3737
ELCFILES = $(ELFILES:.el=.elc)
38-
AUTOLOADS = haskell-site-file.el
38+
AUTOLOADS = haskell-mode-autoloads.el
3939
DIST_FILES = $(ELFILES) $(ELCFILES) $(AUTOLOADS) haskell-mode-pkg.el.in logo.svg Makefile README.md NEWS
4040
DIST_FILES_EX = examples/init.el examples/fontlock.hs examples/indent.hs
4141
DIST_TGZ = haskell-mode-$(GIT_VERSION).tar.gz
@@ -91,9 +91,10 @@ $(PKG_TAR): $(PKG_DIST_FILES) haskell-mode-pkg.el.in
9191
@echo "Created ELPA compatible distribution package '$@' from $(GIT_VERSION)"
9292

9393
$(AUTOLOADS): $(ELFILES) haskell-mode.elc
94-
[ -f $@ ] || echo ' ' >$@
95-
$(BATCH) --eval '(setq generated-autoload-file "'`pwd`'/$@")' -f batch-update-autoloads "."
96-
$(RM) $(AUTOLOADS)~
94+
$(BATCH) \
95+
--eval '(setq make-backup-files nil)' \
96+
--eval '(setq generated-autoload-file "$(CURDIR)/$@")' \
97+
-f batch-update-autoloads "."
9798

9899
# embed version number into .elc file
99100
haskell-mode.elc: haskell-mode.el

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ $ apt-get install haskell-mode
120120

121121
and then adding the following command to your init file (`~/.emacs` or `~/.emacs.d/init.el`):
122122

123-
```lisp
124-
(load "~/lib/emacs/haskell-mode/haskell-site-file")
123+
```el
124+
(add-to-list 'load-path "~/lib/emacs/haskell-mode/")
125+
(require 'haskell-mode-autoloads)
125126
```
126127
127128
Basic Configuration

0 commit comments

Comments
 (0)