From 8a1e8aa07a69c4c2051deaae083e6497e0ade036 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 21 Sep 2016 15:48:19 +0200 Subject: [PATCH] Fix man page installation path Make pages should go to /XXX/share/man and not to /XXX/man/. In case of Debian package, use Debian-specific mechanism to install the man page. --- Makefile | 14 +++++++++----- debian/rules | 3 +++ debian/sterm.manpages | 1 + 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 debian/sterm.manpages diff --git a/Makefile b/Makefile index 794e7b2..8636bce 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,18 @@ CFLAGS = -O2 -Wall LDLIBS = -llockdev +PREFIX ?= /usr/local + all: sterm clean: rm -f sterm install: all - install -d $(DESTDIR)/usr/bin - install -m 755 sterm $(DESTDIR)/usr/bin - install -d $(DESTDIR)/usr/local/man/man1 - install -m 644 sterm.man $(DESTDIR)/usr/local/man/man1/sterm.1 - gzip -f $(DESTDIR)/usr/local/man/man1/sterm.1 + install -d $(DESTDIR)$(PREFIX)/bin + install -m 755 sterm $(DESTDIR)$(PREFIX)/bin +ifneq ($(NO_MAN),1) + install -d $(DESTDIR)$(PREFIX)/share/man/man1 + install -m 644 sterm.man $(DESTDIR)$(PREFIX)/share/man/man1/sterm.1 + gzip -f $(DESTDIR)$(PREFIX)/share/man/man1/sterm.1 +endif diff --git a/debian/rules b/debian/rules index e6040d6..9fffce8 100755 --- a/debian/rules +++ b/debian/rules @@ -16,6 +16,9 @@ include /usr/share/dpkg/default.mk # package maintainers to append LDFLAGS #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +# Variables to pass to sterm Makefile +export PREFIX=/usr +export NO_MAN=1 # main packaging script based on dh7 syntax %: diff --git a/debian/sterm.manpages b/debian/sterm.manpages new file mode 100644 index 0000000..32ebd42 --- /dev/null +++ b/debian/sterm.manpages @@ -0,0 +1 @@ +sterm.man -- 2.39.2