Skip to content

Commit 5807ab1

Browse files
committed
Merge pull request #627 from jhenahan/feature/no-marmalade-please
Removes references to Marmalade in documentation and build process.
2 parents 3485659 + 901312f commit 5807ab1

File tree

3 files changed

+2
-22
lines changed

3 files changed

+2
-22
lines changed

Makefile

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# - Makefile
77
# - haskell-mode.el
88
# - haskell-mode.texi
9-
# - haskell-mode-pkg.el (used for marmelade)
109
#
1110
# We should have a script that changes it everywhere it is needed and
1211
# syncs it with current git tag.
@@ -78,7 +77,6 @@ ELCFILES = $(ELFILES:.el=.elc)
7877
AUTOLOADS = haskell-mode-autoloads.el
7978

8079
PKG_DIST_FILES = $(ELFILES) logo.svg NEWS haskell-mode.info dir
81-
PKG_TAR = haskell-mode-$(VERSION).tar
8280
ELCHECKS=$(addprefix check-, $(ELFILES:.el=))
8381

8482
%.elc: %.el
@@ -113,7 +111,7 @@ check: $(ELCHECKS)
113111
@echo "checks passed!"
114112

115113
clean:
116-
$(RM) $(ELCFILES) $(AUTOLOADS) $(AUTOLOADS:.el=.elc) $(PKG_TAR) haskell-mode.info dir
114+
$(RM) $(ELCFILES) $(AUTOLOADS) $(AUTOLOADS:.el=.elc) haskell-mode.info dir
117115

118116
info: haskell-mode.info dir
119117

@@ -138,20 +136,6 @@ haskell-mode.info: haskell-mode.texi
138136
haskell-mode.html: haskell-mode.texi
139137
$(MAKEINFO) $(MAKEINFO_FLAGS) --html --no-split -o $@ $<
140138

141-
# Generate ELPA-compatible package
142-
package: $(PKG_TAR)
143-
elpa: $(PKG_TAR)
144-
145-
$(PKG_TAR): $(PKG_DIST_FILES) haskell-mode-pkg.el
146-
rm -rf haskell-mode-$(VERSION)
147-
mkdir haskell-mode-$(VERSION)
148-
cp $(PKG_DIST_FILES) haskell-mode-$(VERSION)/
149-
150-
tar cvf $@ haskell-mode-$(VERSION)
151-
rm -rf haskell-mode-$(VERSION)
152-
@echo
153-
@echo "Created ELPA compatible distribution package '$@' from $(VERSION)"
154-
155139
$(AUTOLOADS): $(ELFILES) haskell-mode.elc
156140
$(BATCH) \
157141
--eval '(setq make-backup-files nil)' \

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ for setup and user guide.
6969

7070
Other means of obtaining `haskell-mode` include
7171
[el-get](https://github.com/dimitri/el-get),
72-
[Marmalade](http://marmalade-repo.org/packages/haskell-mode),
7372
[Emacs Prelude](https://github.com/bbatsov/prelude) and [Debian package](https://packages.debian.org/search?keywords=haskell-mode).
7473

7574

haskell-mode.texi

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,7 @@ Requests}.
130130
@chapter Getting Started
131131

132132
If you are reading this, you have most likely already managed to install
133-
Haskell Mode in one way or another. However, just for the record, the
134-
officially recommended way is to install Haskell Mode via the
135-
@uref{http://marmalade-repo.org/packages/haskell-mode,Marmalade package
136-
archive} which contains the latest stable release of Haskell Mode.
133+
Haskell Mode in one way or another.
137134

138135
@findex haskell-customize
139136
Most of Haskell Mode's settings are configurable via customizable

0 commit comments

Comments
 (0)