From dbcf13230edfb15eb0b723b0548b087315b17186 Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Tue, 9 Apr 2024 23:56:44 +0200 Subject: share/mk/: Remove support for installing compressed pages I don't like compressed pages: they make it more difficult/slow to grep them. This was added to make it easier for users to install compressed pages even when installing from source, but probably nobody cares at all these days about a few KiB per page; drive space got cheap. Also, some of the algorithms were added just for benchmarking (for demonstrating that they were bad in this case), and not for real use. This reduces a use of compression tools, which seem to be dangerous these days. Link: Link: Signed-off-by: Alejandro Colomar --- share/mk/configure/man/z.mk | 21 --------------------- share/mk/install/man.mk | 34 ++++------------------------------ 2 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 share/mk/configure/man/z.mk diff --git a/share/mk/configure/man/z.mk b/share/mk/configure/man/z.mk deleted file mode 100644 index 8328abfd7..000000000 --- a/share/mk/configure/man/z.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2023-2024, Alejandro Colomar -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_CONFIGURE_MAN_Z_INCLUDED -MAKEFILE_CONFIGURE_MAN_Z_INCLUDED := 1 - - -Z := -ifeq ($(Z),) -else ifeq ($(Z),.bz2) -else ifeq ($(Z),.gz) -else ifeq ($(Z),.lz) -else ifeq ($(Z),.xz) -else -$(warning "Z": "$(Z)") -$(error Valid values for "Z": ["", ".bz2", ".gz", ".lz", ".xz"]) -endif - - -endif # include guard diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk index e4e0c2262..f32fd01b1 100644 --- a/share/mk/install/man.mk +++ b/share/mk/install/man.mk @@ -6,21 +6,16 @@ ifndef MAKEFILE_INSTALL_MAN_INCLUDED MAKEFILE_INSTALL_MAN_INCLUDED := 1 -include $(MAKEFILEDIR)/configure/build-depends/bzip2/bzip2.mk include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk include $(MAKEFILEDIR)/configure/build-depends/coreutils/ln.mk include $(MAKEFILEDIR)/configure/build-depends/coreutils/test.mk include $(MAKEFILEDIR)/configure/build-depends/findutils/xargs.mk include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk -include $(MAKEFILEDIR)/configure/build-depends/gzip/gzip.mk -include $(MAKEFILEDIR)/configure/build-depends/lzip/lzip.mk include $(MAKEFILEDIR)/configure/build-depends/moreutils/sponge.mk include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk -include $(MAKEFILEDIR)/configure/build-depends/xz-utils/xz.mk include $(MAKEFILEDIR)/configure/directory_variables/install.mk include $(MAKEFILEDIR)/configure/directory_variables/src.mk include $(MAKEFILEDIR)/configure/man/link_pages.mk -include $(MAKEFILEDIR)/configure/man/z.mk include $(MAKEFILEDIR)/install/_.mk include $(MAKEFILEDIR)/src/man.mk @@ -31,11 +26,11 @@ $(foreach s, $(MANSECTIONS), \ $(foreach s, $(MANSECTIONS), \ $(eval _man$(s)pages := \ - $(patsubst $(MAN$(s)DIR)/%.$(s), $(_man$(s)dir)/%$(man$(s)ext)$(Z), \ + $(patsubst $(MAN$(s)DIR)/%.$(s), $(_man$(s)dir)/%$(man$(s)ext), \ $(MAN$(s)PAGES)))) $(foreach s, $(MANSECTIONS), \ $(eval _man$(s)intropage := \ - $(patsubst $(MAN$(s)DIR)/%.$(s), $(_man$(s)dir)/%$(man$(s)ext)$(Z), \ + $(patsubst $(MAN$(s)DIR)/%.$(s), $(_man$(s)dir)/%$(man$(s)ext), \ $(MAN$(s)INTROPAGE)))) _manintropages := $(foreach s, $(MANSECTIONS), $(_man$(s)intropage)) _manpages := $(_manintropages) $(foreach s, $(MANSECTIONS), $(_man$(s)pages)) @@ -49,7 +44,7 @@ $(foreach s, $(MANSECTIONS), \ $(foreach s, $(MANSECTIONS), \ $(eval $(_man$(s)pages) $(_man$(s)intropage): \ - $(_man$(s)dir)/%$(man$(s)ext)$(Z): \ + $(_man$(s)dir)/%$(man$(s)ext): \ $(_MANDIR)/man$(s)/%.$(s) $(MK) | $$$$(@D)/)) @@ -57,7 +52,7 @@ $(_manpages): $(info $(INFO_)INSTALL $@) <$< \ $(SED) $(foreach s, $(MANSECTIONS), \ - -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext)$(Z),') \ + -e '/^\.so /s, man$(s)/\(.*\)\.$(s)$$, $(notdir $(man$(s)dir))/\1$(man$(s)ext),') \ | $(INSTALL_DATA) -T /dev/stdin $@ ifeq ($(LINK_PAGES),symlink) if $(GREP) '^\.so ' <$@ >/dev/null; then \ @@ -66,27 +61,6 @@ ifeq ($(LINK_PAGES),symlink) | $(XARGS) -I tgt $(LN) -fsT tgt $@; \ fi endif -ifeq ($(Z),.bz2) - if ! $(TEST) -L $@; then \ - $(BZIP2) $(BZIP2FLAGS) <$@ \ - | $(SPONGE) $@; \ - fi -else ifeq ($(Z),.gz) - if ! $(TEST) -L $@; then \ - $(GZIP) $(GZIPFLAGS) <$@ \ - | $(SPONGE) $@; \ - fi -else ifeq ($(Z),.lz) - if ! $(TEST) -L $@; then \ - $(LZIP) $(LZIPFLAGS) <$@ \ - | $(SPONGE) $@; \ - fi -else ifeq ($(Z),.xz) - if ! $(TEST) -L $@; then \ - $(XZ) $(XZFLAGS) <$@ \ - | $(SPONGE) $@; \ - fi -endif .PHONY: install-manintro -- cgit v1.2.3