feat(debian): install Emacs plugin

The Debian package does not install the Emacs LISP files. Install the .el files so that Emacs works out of the box without manual setup.
quick-lint · Oct 13, 2023 · c36705b · c36705b
1 parent 86f1f1c
commit c36705b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/dist/debian/debian/quick-lint-js.install b/dist/debian/debian/quick-lint-js.install
@@ -1,5 +1,6 @@
 usr/bin usr
 usr/share/bash-completion usr/share
+usr/share/emacs/site-lisp usr/share/emacs
 usr/share/fish usr/share
 usr/share/icons usr/share
 usr/share/man usr/share

diff --git a/dist/debian/debian/rules b/dist/debian/debian/rules
@@ -15,6 +15,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DQUICK_LINT_JS_HAVE_FCHAR8_T_FLAG=YES \
 		-DQUICK_LINT_JS_HAVE_WORKING_FCHAR8_T=NO \
+		-DQUICK_LINT_JS_INSTALL_EMACS_DIR=share/emacs/site-lisp/quick-lint-js \
 		-DQUICK_LINT_JS_INSTALL_VIM_DIR=share/vim/addons \
 		-DQUICK_LINT_JS_INSTALL_VIM_NEOVIM_TAGS=ON \
 		-DQUICK_LINT_JS_USE_BUNDLED_GOOGLE_BENCHMARK=NO \

diff --git a/dist/debian/debian/rules-bionic b/dist/debian/debian/rules-bionic
@@ -15,6 +15,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -flto-partition=none
 override_dh_auto_configure:
 	# quick-lint-js does not build with GCC 7. Request GCC 8 by default.
 	CC="$${CC-gcc-8}" CXX="$${CXX-g++-8}" dh_auto_configure -- \
+		-DQUICK_LINT_JS_INSTALL_EMACS_DIR=share/emacs/site-lisp/quick-lint-js \
 		-DQUICK_LINT_JS_INSTALL_VIM_DIR=share/vim/addons \
 		-DQUICK_LINT_JS_INSTALL_VIM_NEOVIM_TAGS=ON \
 		-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=YES

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -21,6 +21,8 @@ Semantic Versioning.
   setters cannot be generators"). (Implemented by [koopiehoop][].)
 * `async get` and `async set` in classes now report [E0714][] ("'async' keyword
   is not allowed on getters or setters"). (Implemented by [koopiehoop][].)
+* Emacs: The Debian/Ubuntu package now installs the Emacs plugin. Manual
+  installation of the .el files is no longer required.
 * TypeScript support (still experimental):
   * Class method overload signatures are now parsed.
   * [E0398][] is now reported when using both `abstract` and `static` on a

diff --git a/website/public/install/emacs/debian/index.ejs.html b/website/public/install/emacs/debian/index.ejs.html
@@ -25,8 +25,7 @@ <h2>1. Install prerequisites</h2>
 
       <h2>2. Install quick-lint-js</h2>
       <%- await include("../../common-debian.ejs.html", {vim: false}) %> <%-
-      await include("../common-manual.ejs.html", {os: "posix", step: 3}) %> <%-
-      await include("../common-configure.ejs.html", {step: 4}) %>
+      await include("../common-configure.ejs.html", {step: 3}) %>
     </main>
 
     <footer><%- await include("../../../common-footer-nav.ejs.html") %></footer>