diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-12 01:09:03 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-12 01:09:03 -0400 |
| commit | e326d7fcd810a69d3558fecdff0500286ddf2ffe (patch) | |
| tree | 1418b7386e59aa3868f33ca36aca2a31976020cf | |
| parent | 4a59488b9f6d03ff74e587f7abcabf64b06837ea (diff) | |
more monkeying around with portable ways to install the manpages.
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | debian/monkeysphere.manpages | 5 | ||||
| -rw-r--r-- | packaging/freebsd/Makefile | 2 |
3 files changed, 9 insertions, 11 deletions
@@ -4,6 +4,7 @@ MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'` # before calling make install ETCPREFIX ?= PREFIX ?= /usr +MANPREFIX ?= $(PREFIX)/share/man all: keytrans @@ -31,7 +32,7 @@ clean: # this target is to be called from the tarball, not from the git # working dir! -install: all +install: all installman mkdir -p $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/share/monkeysphere mkdir -p $(DESTDIR)$(PREFIX)/share/doc/monkeysphere mkdir -p $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere @@ -42,10 +43,12 @@ install: all install -m 0644 etc/* $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere installman: - mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1 $(DESTDIR)$(PREFIX)/share/man/man7 $(DESTDIR)$(PREFIX)/share/man/man8 - install man/man1/* $(DESTDIR)$(PREFIX)/share/man/man1 - install man/man7/* $(DESTDIR)$(PREFIX)/share/man/man7 - install man/man8/* $(DESTDIR)$(PREFIX)/share/man/man8 + mkdir -p $(DESTDIR)$(MANPREFIX)/man1 $(DESTDIR)$(MANPREFIX)/man7 $(DESTDIR)$(MANPREFIX)/man8 + gzip -n man/*/* + install man/man1/* $(DESTDIR)$(MANPREFIX)/man1 + install man/man7/* $(DESTDIR)$(MANPREFIX)/man7 + install man/man8/* $(DESTDIR)$(MANPREFIX)/man8 + gzip -d man/*/* releasenote: ./utils/build-releasenote diff --git a/debian/monkeysphere.manpages b/debian/monkeysphere.manpages deleted file mode 100644 index 1490566..0000000 --- a/debian/monkeysphere.manpages +++ /dev/null @@ -1,5 +0,0 @@ -man/man1/monkeysphere.1 -man/man1/openpgp2ssh.1 -man/man1/monkeysphere-ssh-proxycommand.1 -man/man7/monkeysphere.7 -man/man8/monkeysphere-server.8 diff --git a/packaging/freebsd/Makefile b/packaging/freebsd/Makefile index 5b96f7a..2937d69 100644 --- a/packaging/freebsd/Makefile +++ b/packaging/freebsd/Makefile @@ -28,6 +28,6 @@ MAN7= monkeysphere.7 MAN8= monkeysphere-server.8 MANCOMPRESSED= yes -ETCPREFIX = /usr/local +MAKE_ARGS= ETCPREFIX=/usr/local MANPREFIX=/usr/local/man .include <bsd.port.mk> |