summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorAndreas Politz <politza@hochschule-trier.de>2015-02-07 16:34:33 +0100
committerAndreas Politz <politza@hochschule-trier.de>2015-02-07 16:35:41 +0100
commit6954fd6ba49daac1e8306043677fedd2db2bd509 (patch)
tree626e4efaca42cc7c29049549088c16731ec08fe7 /Makefile
parent5f733f68d4a09cb2d52545e6eea7768d4273824c (diff)
Streamline melpa upgrading.
* lisp/pdf-tools.el: Added an autoload, which checks whether a upgrade is in process and tries to do the right things. (pdf-tools--melpa-build-server): Added possibility to skip installing dependencies and a callback argument. (pdf-tools-install): Allow for automatic compilation and skipping of dependencies stuff. * Makefile: Added a target producing melpa-like packages. Removed the instruction about calling pdf-tools-install once more.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 11 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 6ba936e..68abbb3 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,14 @@ package: server/epdfinfo
echo '$(PKGFILE_CONTENT)' > '$(PACKAGE_DIR)/pdf-tools-pkg.el'
tar cf '$(PACKAGE_NAME).tar' '$(PACKAGE_DIR)'
+melpa-package:
+ $(MAKE) distclean
+ mkdir -p '$(PACKAGE_DIR)/build'
+ cp -u lisp/*.el README -t '$(PACKAGE_DIR)'
+ cp -r Makefile server '$(PACKAGE_DIR)/build'
+ echo '$(PKGFILE_CONTENT)' > '$(PACKAGE_DIR)/pdf-tools-pkg.el'
+ tar cf '$(PACKAGE_NAME).tar' '$(PACKAGE_DIR)'
+
install-package: package
$(EMACS) $(EFLAGS) --eval \
"(progn (package-initialize) \
@@ -65,9 +73,9 @@ melpa-build: server/epdfinfo
-cp -p server/epdfinfo ..
$(MAKE) distclean
@if [ -x ../epdfinfo ]; then \
- echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; \
- echo "Server successfully build. Do M-x pdf-tools-install again."; \
- echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; \
+ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~"; \
+ echo "Server successfully build. "; \
+ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~"; \
else \
echo "Server not build, maybe due to missing dependencies (See README)."; \
echo "Required: gcc g++ make automake autoconf libpng-dev libz-dev libpoppler-glib-dev libpoppler-private-dev"; \