X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=debian%2Fnotmuch.emacsen-startup;h=73f387ec474ea23c27064bed38301a27aff46277;hp=017938d5af095570c467fda20fab867775c43be9;hb=4edf37a1d5067197741b8dcb0bdb72ce4c299c05;hpb=3cb3d2c021b5c06bae9757400cc8c6b72db16531

diff --git a/debian/notmuch.emacsen-startup b/debian/notmuch.emacsen-startup
index 017938d5..73f387ec 100644
--- a/debian/notmuch.emacsen-startup
+++ b/debian/notmuch.emacsen-startup
@@ -1,21 +1,19 @@
 ;; -*-emacs-lisp-*-
 ;;
 ;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50notmuch.el
-;; for the Debian #PACKAGE# package
+;; for the Debian notmuch package
 ;;
 ;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
 ;; Modified by Dirk Eddelbuettel <edd@debian.org>
 ;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
 
-;; The #PACKAGE# package follows the Debian/GNU Linux 'emacsen' policy and
+;; The notmuch package follows the Debian/GNU Linux 'emacsen' policy and
 ;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
 ;; xemacs19, emacs20, xemacs20...).  The compiled code is then
 ;; installed in a subdirectory of the respective site-lisp directory.
-;; We have to add this to the load-path:
-(let ((package-dir (concat "/usr/share/"
-                           (symbol-name flavor)
-                           "/site-lisp/notmuch")))
-;; If package-dir does not exist, the notmuch package must have
-;; removed but not purged, and we should skip the setup.
-  (when (file-directory-p package-dir)
-    (setq load-path (cons package-dir load-path))
+
+(if (not (file-exists-p "/usr/share/emacs/site-lisp/notmuch"))
+    (message "Package notmuch removed but not purged.  Skipping setup.")
+  (debian-pkg-add-load-path-item
+   (concat
+    "/usr/share/" (symbol-name debian-emacs-flavor) "/site-lisp/notmuch"))