[nongnu] elpa/drupal-mode ce7e9d2bf3 043/308: Various cleanup.

[ELPA Syncer]

branch: elpa/drupal-mode
commit ce7e9d2bf3dd2ae2f8d84994850dc32b0101afea
Author: Arne Jørgensen <arne@arnested.dk>
Commit: Arne Jørgensen <arne@arnested.dk>

    Various cleanup.
---
 Makefile | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index a9f7e265b2..00b0930b52 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,14 @@
 .PHONY: all clean install
 
 ARCHIVE_NAME:=drupal-mode
-VERSION:=$(shell emacs --batch --eval "(with-temp-buffer \
-               (require 'package)\
+VERSION:=$(shell emacs --batch -l package --eval "(with-temp-buffer \
                (insert-file \"$(ARCHIVE_NAME).el\")\
                (princ (aref (package-buffer-info) 3)))")
 PACKAGE_NAME:=$(ARCHIVE_NAME)-$(VERSION)
 
 all: $(PACKAGE_NAME).tar
 
-drupal-mode.info: README.md
+$(ARCHIVE_NAME).info: README.md
        pandoc -t texinfo $^ | makeinfo -o $@
 
 README: README.md
@@ -18,8 +17,7 @@ README: README.md
 # requires package-build.el from https://github.com/milkypostman/melpa
 # to be available in your emacs load-path
 $(ARCHIVE_NAME)-pkg.el: $(ARCHIVE_NAME).el
-       emacs --batch --user `whoami` --eval "(progn \
-               (require 'package-build) \
+       emacs --batch --user `whoami` -l package-build --eval "(progn \
                (pb/write-pkg-file \
                        \"$(ARCHIVE_NAME)-pkg.el\" \
                        (with-temp-buffer \
@@ -27,11 +25,11 @@ $(ARCHIVE_NAME)-pkg.el: $(ARCHIVE_NAME).el
                                (package-buffer-info))))"
 
 # create a tar ball in package.el format for uploading to 
http://marmalade-repo.org
-$(PACKAGE_NAME).tar: README $(ARCHIVE_NAME).el $(ARCHIVE_NAME)-pkg.el 
drupal-mode.info dir drupal/*.el
+$(PACKAGE_NAME).tar: README $(ARCHIVE_NAME).el $(ARCHIVE_NAME)-pkg.el 
$(ARCHIVE_NAME).info dir drupal/*.el
        tar -c -s "@^@$(PACKAGE_NAME)/@" -f $(PACKAGE_NAME).tar $^
 
 install: $(PACKAGE_NAME).tar
-       emacs --batch --user `whoami` --eval "(progn \
+       emacs --batch --user `whoami` -l package --eval "(progn \
                (package-initialize)\
                (package-install-file \"`pwd`/$(PACKAGE_NAME).tar\"))"