From f154a0489aa99ea48fa89a2724536f4c98815977 Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Tue, 19 Oct 2021 09:50:18 +0200 Subject: Makefile: Install man pages to /usr/share/man instead of /usr/man Reported-by: Martin Hauke Signed-off-by: Stefano Brivio --- Makefile | 10 +++++----- test/build/install | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 2385afa..6dd22f6 100644 --- a/Makefile +++ b/Makefile @@ -38,17 +38,17 @@ clean: passt.tar passt.tar.gz *.deb *.rpm install: passt pasta qrap - mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/man/man1 + mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/man/man1 cp -d passt pasta qrap $(DESTDIR)$(prefix)/bin - cp -d passt.1 pasta.1 qrap.1 $(DESTDIR)$(prefix)/man/man1 + cp -d passt.1 pasta.1 qrap.1 $(DESTDIR)$(prefix)/share/man/man1 uninstall: -${RM} $(DESTDIR)$(prefix)/bin/passt -${RM} $(DESTDIR)$(prefix)/bin/pasta -${RM} $(DESTDIR)$(prefix)/bin/qrap - -${RM} $(DESTDIR)$(prefix)/man/man1/passt.1 - -${RM} $(DESTDIR)$(prefix)/man/man1/pasta.1 - -${RM} $(DESTDIR)$(prefix)/man/man1/qrap.1 + -${RM} $(DESTDIR)$(prefix)/share/man/man1/passt.1 + -${RM} $(DESTDIR)$(prefix)/share/man/man1/pasta.1 + -${RM} $(DESTDIR)$(prefix)/share/man/man1/qrap.1 pkgs: tar cf passt.tar -P --xform 's//\/usr\/bin\//' passt pasta qrap diff --git a/test/build/install b/test/build/install index 0a09fc7..2c93647 100644 --- a/test/build/install +++ b/test/build/install @@ -20,15 +20,15 @@ host prefix=__TEMP__ make install check [ -f __TEMP__/bin/passt ] check [ -h __TEMP__/bin/pasta ] check [ -f __TEMP__/bin/qrap ] -check man -M __TEMP__/man -W passt -check man -M __TEMP__/man -W pasta -check man -M __TEMP__/man -W qrap +check man -M __TEMP__/share/man -W passt +check man -M __TEMP__/share/man -W pasta +check man -M __TEMP__/share/man -W qrap test Uninstall host prefix=__TEMP__ make uninstall check ! [ -f __TEMP__/bin/passt ] check ! [ -h __TEMP__/bin/pasta ] check ! [ -f __TEMP__/bin/qrap ] -check ! man -M __TEMP__/man -W passt 2>/dev/null -check ! man -M __TEMP__/man -W pasta 2>/dev/null -check ! man -M __TEMP__/man -W qrap 2>/dev/null +check ! man -M __TEMP__/share/man -W passt 2>/dev/null +check ! man -M __TEMP__/share/man -W pasta 2>/dev/null +check ! man -M __TEMP__/share/man -W qrap 2>/dev/null -- cgit v1.2.3