1 files changed, 17 insertions, 20 deletions
diff --git a/debian/urweb-mode.emacsen-startup b/debian/urweb-mode.emacsen-startup
index 4341955a..f2e2a24a 100644
--- a/debian/urweb-mode.emacsen-startup
+++ b/debian/urweb-mode.emacsen-startup
@@ -1,21 +1,18 @@
 ;; -*-emacs-lisp-*-
-
-(if (not (file-exists-p "/usr/share/emacs/site-lisp/urweb-mode"))
-    (message "Package urweb-mode removed but not purged.  Skipping setup.")
-
-  (let ((pkgdir (concat "/usr/share/"
-                        (symbol-name debian-emacs-flavor)
-                        "/site-lisp/urweb-mode")))
-
-    ;; Only load urweb-mode if it has been installed.
-    (if (zerop (length (file-expand-wildcards pkgdir)))
-        (message "urweb-mode not for this flavor.  Skipping.")
-
-      ;; The urweb-mode package follows the Debian/GNU Linux 'emacsen' policy
-      ;; and byte-compiles its elisp files for each 'emacs flavor'.  The
-      ;; compiled code is then installed in a subdirectory of the respective
-      ;; site-lisp directory.
-      (debian-pkg-add-load-path-item pkgdir)
-
-      ;; Autoload urweb-mode top-level functions site-wide.
-      (load "urweb-mode-startup"))))
+;; The urweb-mode 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 debian-emacs-flavor)
+                           "/site-lisp/urweb-mode")))
+;; If package-dir does not exist, the urweb-mode package must have
+;; removed but not purged, and we should skip the setup.
+  (when (file-directory-p package-dir)
+    (if (fboundp 'debian-pkg-add-load-path-item)
+        (debian-pkg-add-load-path-item package-dir)
+      (setq load-path (cons package-dir load-path)))
+    ;; urweb-mode maintains its own autoloads file, so just rely on it instead
+    ;; of creating another set of autoloads.
+    (load "urweb-mode-startup")))