Skip to content

Removes references to Marmalade in documentation and build process. Closes #626. #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 4, 2015
Merged

Removes references to Marmalade in documentation and build process. Closes #626. #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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)' \
Expand Down
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).


Expand Down
5 changes: 1 addition & 4 deletions haskell-mode.texi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down