Merge pull request #627 from jhenahan/feature/no-marmalade-please

Removes references to Marmalade in documentation and build process.

Author: gracjan

Makefile

@@ -6,7 +6,6 @@
 # - Makefile
 # - haskell-mode.el
 # - haskell-mode.texi
-# - haskell-mode-pkg.el (used for marmelade)
 #
 # We should have a script that changes it everywhere it is needed and
 # syncs it with current git tag.
@@ -78,7 +77,6 @@ ELCFILES = $(ELFILES:.el=.elc)
 AUTOLOADS = haskell-mode-autoloads.el
 
 PKG_DIST_FILES = $(ELFILES) logo.svg NEWS haskell-mode.info dir
-PKG_TAR = haskell-mode-$(VERSION).tar
 ELCHECKS=$(addprefix check-, $(ELFILES:.el=))
 
 %.elc: %.el
@@ -113,7 +111,7 @@ check: $(ELCHECKS)
 	@echo "checks passed!"
 
 clean:
-	$(RM) $(ELCFILES) $(AUTOLOADS) $(AUTOLOADS:.el=.elc) $(PKG_TAR) haskell-mode.info dir
+	$(RM) $(ELCFILES) $(AUTOLOADS) $(AUTOLOADS:.el=.elc) haskell-mode.info dir
 
 info: haskell-mode.info dir
 
@@ -138,20 +136,6 @@ haskell-mode.info: haskell-mode.texi
 haskell-mode.html: haskell-mode.texi
 	$(MAKEINFO) $(MAKEINFO_FLAGS) --html --no-split -o $@ $<
 
-# Generate ELPA-compatible package
-package: $(PKG_TAR)
-elpa: $(PKG_TAR)
-
-$(PKG_TAR): $(PKG_DIST_FILES) haskell-mode-pkg.el
-	rm -rf haskell-mode-$(VERSION)
-	mkdir haskell-mode-$(VERSION)
-	cp $(PKG_DIST_FILES) haskell-mode-$(VERSION)/
-
-	tar cvf $@ haskell-mode-$(VERSION)
-	rm -rf haskell-mode-$(VERSION)
-	@echo
-	@echo "Created ELPA compatible distribution package '$@' from $(VERSION)"
-
 $(AUTOLOADS): $(ELFILES) haskell-mode.elc
 	$(BATCH) \
 		--eval '(setq make-backup-files nil)' \

README.md

@@ -69,7 +69,6 @@ for setup and user guide.
 
 Other means of obtaining `haskell-mode` include
 [el-get](https://github.com/dimitri/el-get),
-[Marmalade](http://marmalade-repo.org/packages/haskell-mode),
 [Emacs Prelude](https://github.com/bbatsov/prelude) and [Debian package](https://packages.debian.org/search?keywords=haskell-mode).
 
 

haskell-mode.texi

@@ -130,10 +130,7 @@ Requests}.
 @chapter Getting Started
 
 If you are reading this, you have most likely already managed to install
-Haskell Mode in one way or another. However, just for the record, the
-officially recommended way is to install Haskell Mode via the
-@uref{http://marmalade-repo.org/packages/haskell-mode,Marmalade package
-archive} which contains the latest stable release of Haskell Mode.
+Haskell Mode in one way or another.
 
 @findex haskell-customize
 Most of Haskell Mode's settings are configurable via customizable