New configuration setup script: install

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/.gitignore b/.gitignore
index 1fded1e69e360d21e8ba7533042556f71e504d46..1baa4c2dba9cc7724287139edcff2b15bb39cb6b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /docs/doctrees
 /stamp
 /tmp
+/hippotat-setup-permissions.8

diff --git a/Makefile b/Makefile
index c611c2af850b71874bf8296492ec0dffa3822d1b..ae6e1faeb5d4172abbe8fcfbea8f996328e27f56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,8 @@ rsrcs = $(shell $(foreach x,$(MAKEFILE_FIND_X),set -$x;)\
 stamp=@mkdir -p stamp; touch $@
 
 TESTS=$(notdir $(wildcard test/t-*[^~]))
+MAN8PAGES=hippotat-setup-permissions.8
+MANPAGES=$(MAN8PAGES)
 
 all:   cargo-build doc
 
@@ -56,7 +58,7 @@ stamp/t-%: test/t-% stamp/cargo-build $(wildcard test/*[^~])
        $(abspath test/go-with-unshare test/t-$*)
        @echo OK t-$*; touch $@
 
-doc:   docs/html/index.html
+doc:   docs/html/index.html $(MANPAGES)
        @echo 'Documentation can now be found here:'
        @echo '  file://$(PWD)/$<'
 
@@ -64,14 +66,22 @@ docs/html/index.html: docs/conf.py $(wildcard docs/*.md docs/*.rst docs/*.png)
        rm -rf docs/html
        $(SPHINXBUILD) -M html docs docs $(SPHINXOPTS)
 
+hippotat-setup-permissions%: hippotat-setup-permissions%.pod
+       m=$@; pod2man --section=$${m##*.} --date="Hippotat" \
+               --center=" " --name=$${m%.*} \
+               $^ $@
+
 doch=/usr/share/doc/hippotat/
 
 install: all
-       $(INSTALL) -d $(DESTDIR)/usr/{bin,sbin} $(DESTDIR)$(doch)
+       $(INSTALL) -d $(DESTDIR)/usr/{bin,sbin}
+       $(INSTALL) -d $(DESTDIR)$(doch) $(DESTDIR)$(man8dir)
        $(INSTALL) -m 755 $(TARGET_RELEASE_DIR)/hippotat $(DESTDIR)/usr/bin/.
        $(INSTALL) -m 755 $(TARGET_RELEASE_DIR)/hippotatd $(DESTDIR)/usr/sbin/.
+       $(INSTALL) -m 755 hippotat-setup-permissions $(DESTDIR)/usr/bin/.
        cp -r docs/html $(DESTDIR)$(doch)
        $(INSTALL) -m 644 PROTOCOL.txt $(DESTDIR)$(doch)/
+       $(INSTALL) -m 644 $(MAN8PAGES) $(DESTDIR)$(man8dir)/.
 
 clean:
        rm -rf stamp/* doc/html

diff --git a/debian/hippotat-common.install b/debian/hippotat-common.install
index 230a0747ed167fe4b8b82735619467d3f159b4b5..5e50dabd873cd8e74ee2f3bd7719a1f7f58e1e8e 100644 (file)
--- a/debian/hippotat-common.install
+++ b/debian/hippotat-common.install
@@ -1 +1,2 @@
+usr/bin/hippotat-setup-permissions
 usr/share/doc/hippotat