[nongnu] elpa/scala-mode c21f88f 124/217: Merge pull request #61 from nicferrier/marmalade

[ELPA Syncer]

branch: elpa/scala-mode
commit c21f88fa8372ac6ecaed8a71f7164136843fb800
Merge: bc446e7 f431bb3
Author: Heikki Vesalainen <heikki.vesalainen@iki.fi>
Commit: Heikki Vesalainen <heikki.vesalainen@iki.fi>

    Merge pull request #61 from nicferrier/marmalade
    
    provide a package target to make a marmalade compatible package
---
 Makefile  | 15 +++++++++++++--
 README.md | 29 +++++++++++++++++++++++++----
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 9288123..7cdc5f7 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ ELISP_FILES           += scala-mode2-indent
 ELISP_FILES            += scala-mode2-paragraph
 ELISP_FILES            += scala-mode2-fontlock
 ELISP_FILES            += scala-mode2-map
+ELISP_FILES            += scala-mode2-sbt
 ELISP_FILES            += scala-mode2-pkg
 
 ELISP_SOURCES          += $(ELISP_FILES:%=$(SOURCE_DIR)/%.el)
@@ -36,15 +37,21 @@ ELISP_SOURCES               += 
$(ELISP_FILES:%=$(SOURCE_DIR)/%.el)
 ##############################################################################
 
 RM                     ?= rm -f
+RMDIR                  ?= rmdir
 TOUCH                  ?= touch
 
+# Strip the version out of the pkg file
+VERSION                 = $(shell ${ELISP_COMMAND} --batch --eval '(princ 
(format "%s\n" (car (cddr (read (find-file "scala-mode2-pkg.el"))))))' | grep 
-v Loading)
+
 ##############################################################################
 # Commands
 
 all: .latest-build
 
 clean:
-       $(RM) *.elc .latest-* autoloads.el
+       $(RM) *.elc .latest-* autoloads.el scala-mode2-$(VERSION).tar
+       [ -d scala-mode2-$(VERSION) ] && $(RM) scala-mode2-$(VERSION)/*
+       [ -d scala-mode2-$(VERSION) ] && $(RMDIR) scala-mode2-$(VERSION)
 
 .PHONY: all
 .PHONY: clean
@@ -59,8 +66,12 @@ clean:
 ##############################################################################
 
 autoloads: $(ELISP_SOURCES)
-       emacs -batch -q --no-site-file --eval "(setq make-backup-files nil)" 
--eval "(setq generated-autoload-file (expand-file-name \"autoloads.el\"))" -f 
batch-update-autoloads `pwd`
+       $(ELISP_COMMAND) -batch -q --no-site-file --eval "(setq 
make-backup-files nil)" --eval "(setq generated-autoload-file (expand-file-name 
\"autoloads.el\"))" -f batch-update-autoloads `pwd`
 
+package:
+       mkdir -p scala-mode2-$(VERSION)
+       cp $(ELISP_SOURCES) scala-mode2-$(VERSION)
+       tar cf scala-mode2-$(VERSION).tar scala-mode2-$(VERSION)
 
 
 ## SCALA LICENSE
diff --git a/README.md b/README.md
index 0e7eab9..1855d29 100644
--- a/README.md
+++ b/README.md
@@ -28,13 +28,14 @@ to the load-path and then to require it. For more 
information regarding
     1. Package.el:
         Using the package.el within Emacs installation is the recommended
         manner to install scala-mode2 as it allows for continuous, easy
-        updating from within Emacs itself. Adding the MELPA
-        repository to your emacs initialization will be required to locate
-        the packages.
+        updating from within Emacs itself. 
+        
+        Adding the MELPA or Marmalade repository to your emacs
+        initialization will be required to locate the packages.
        
         Add the following to your emacs config (.emacs, init.el, etc), and
         if such a definition already exists, ensure that it contains
-        the MELPA declaration.
+        the MELPA or Marmalade declaration, for example:
 
         ```lisp
         (require 'package)
@@ -44,6 +45,25 @@ to the load-path and then to require it. For more 
information regarding
         (unless (package-installed-p 'scala-mode2)
           (package-refresh-contents) (package-install 'scala-mode2))
         ```
+        
+        or you could use ```customize``` to add a repository:
+        
+        ```
+        M-x customize-variable [RET] package-archives
+        ```
+        
+        and add MELPA or Marmalade, for example:
+        
+        ```
+        marmalade   http://marmalade-repo.org/packages/
+        ```
+        
+        and then use package install to install it:
+        
+        ```
+        M-x package-install [RET] scala-mode2 [RET]
+        ```
+        
 
     2. Manual:
         Download the files to a local directory. You can use the *git clone*
@@ -438,3 +458,4 @@ Contributors and valuable feedback:
 - Andrew Jones
 - Vasya Novikov
 - Hugh Giddens
+- Nic Ferrier