From 172e6e1bfc20bcdcee2e7df65c62389406ba5250 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 5 Nov 2016 11:28:54 +0000 Subject: [PATCH] nntpid: install in /usr/bin. Closes:#773651. Signed-off-by: Ian Jackson --- debian/changelog | 1 + scripts/Makefile | 8 +++++++- settings.make | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f54d760..a907b0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ chiark-utils (4.5.0~iwj5) unstable; urgency=medium * cgi-fcgi-interp: correct the copyright header rubric. + * nntpid: install in /usr/bin. Closes:#773651. -- diff --git a/scripts/Makefile b/scripts/Makefile index 56c2440..3ab02e7 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -25,12 +25,14 @@ SCRIPTS= palm-datebook-reminders random-word expire-iso8601 \ genspic2gnuplot gnucap2genspic ngspice2genspic \ cvs-repomove cvs-adjustroot remountresizereiserfs \ hexterm summarise-mailbox-preserving-privacy \ - git-cache-proxy git-branchmove + git-cache-proxy git-branchmove nntpid MANPAGES1= palm-datebook-reminders CSCRIPTS= named-conf CMANPAGES8= named-conf +PERLMODULES= Chiark/NNTP + all: install: @@ -39,6 +41,10 @@ install: $(INSTALL_SCRIPT) $$f $(bindir)/$$f; done set -e; for f in $(CSCRIPTS); do \ $(INSTALL_SCRIPT) $$f $(bindir)/chiark-$$f; done + set -e; for f in $(PERLMODULES); do \ + $(INSTALL_DIRECTORY) ${perl5dir}/$${f%/*}; \ + $(INSTALL_SHARE) $$f.pm $(perl5dir)/$$f.pm; done + install-docs: $(INSTALL_DIRECTORY) $(man1dir) $(man8dir) diff --git a/settings.make b/settings.make index 2a0b183..ff917b1 100644 --- a/settings.make +++ b/settings.make @@ -42,6 +42,7 @@ confdir=$(etcdir)/$(us) bindir=$(prefix)/bin sbindir=$(prefix)/sbin sharedir=$(prefix)/share/$(us) +perl5dir=$(prefix)/share/perl5 txtdocdir=$(prefix)/share/doc/$(us) exampledir=$(txtdocdir)/examples vardir=$(varlib)/$(us) -- 2.30.2