From 8fcbe1a105354f8adb2445a7710c75f9eca1f84c Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Tue, 26 Sep 2017 14:31:11 -0500 Subject: [PATCH] Install custom LSS script to /usr/local/share/fish on make install Decided to move doc_src/fish.lss to share/lynx.lss, which just makes more sense all around. Accordingly, now using {$__fish_datadir} instead of {$__fish_help_dir} in help.fish. Makefile now installs the custom lss on make install (cherry picked from commit 338311af1ee8ef5ddd57fc9fd5a78cef2b8ac39d) --- Makefile.in | 2 ++ share/functions/help.fish | 2 +- {doc_src => share}/lynx.lss | 0 3 files changed, 3 insertions(+), 1 deletion(-) rename {doc_src => share}/lynx.lss (100%) diff --git a/Makefile.in b/Makefile.in index d8c3fc6b7..8462a92f5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -714,6 +714,8 @@ install-force: all install-translations install-doc | show-datadir show-sysconfd $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \ true; \ done; + @echo "Installing miscellaneous helper resources"; + $v $(INSTALL) -m 644 share/lynx.lss $(DESTDIR)$(datadir)/fish/ .PHONY: install-force # diff --git a/share/functions/help.fish b/share/functions/help.fish index 21f8fec75..5ad92a724 100644 --- a/share/functions/help.fish +++ b/share/functions/help.fish @@ -152,7 +152,7 @@ function help --description 'Show help for the fish shell' # by using a custom style sheet. See https://github.com/fish-shell/fish-shell/issues/4170 set -l local_file 0 if eval $fish_browser --version 2>/dev/null | string match -qr Lynx - set fish_browser $fish_browser -lss={$__fish_help_dir}/fish.lss + set fish_browser $fish_browser -lss={$__fish_datadir}/lynx.lss end eval $fish_browser $page_url end diff --git a/doc_src/lynx.lss b/share/lynx.lss similarity index 100% rename from doc_src/lynx.lss rename to share/lynx.lss