From d6853ff7eccf072835f7a93f6a35fc59d7e559fe Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 11 Jul 2015 16:34:41 +0200 Subject: make dh_elpa actually work with an installed elisp file. This is not the most elegant solution in the world, but impovements only need to change this package's debian/rules. --- debian/rules | 2 +- dh_elpa | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 1c6778b..39ea658 100755 --- a/debian/rules +++ b/debian/rules @@ -6,5 +6,5 @@ DESTDIR=$(CURDIR)/debian/tmp dh $@ override_dh_auto_install: - ./dh_elpa dh-elpa.el $(DESTDIR)/usr/share/emacs/site-lisp/elpa + LISPDIR=. ./dh_elpa dh-elpa.el $(DESTDIR)/usr/share/emacs/site-lisp/elpa install -m 755 -D dh_elpa $(DESTDIR)/usr/bin/dh_elpa diff --git a/dh_elpa b/dh_elpa index 93332ce..fef3c27 100755 --- a/dh_elpa +++ b/dh_elpa @@ -1,3 +1,5 @@ #!/bin/sh -emacs -batch -Q -l dh-elpa.el -f dhelpa-batch-install-file "$@" +LISPDIR=${LISPDIR:-/usr/share/emacs/site-lisp/elpa/dh-elpa-${VERSION}} + +emacs -batch -Q -l ${LISPDIR}/dh-elpa.el -f dhelpa-batch-install-file "$@" -- cgit v1.2.1