nntpid: install in /usr/bin. Closes:#773651.

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

diff --git a/debian/changelog b/debian/changelog
index f54d760a89f8f27b9eab44b8c887e7fdc83b8754..a907b0c693910032ab1cd33d2f0c9a8ed81c1929 100644 (file)
--- 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.
 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 56c2440c1b396a498bd3ef916e6ffc1010291a7b..3ab02e74c2ad8ecbcb30bfbf1f1279bd6490e421 100644 (file)
--- 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 \
                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
 
 MANPAGES1=     palm-datebook-reminders
 
 CSCRIPTS=      named-conf
 CMANPAGES8=    named-conf
 

+PERLMODULES=   Chiark/NNTP
+

 all:
 
 install:
 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
                        $(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)
 
 install-docs:
                $(INSTALL_DIRECTORY) $(man1dir) $(man8dir)

diff --git a/settings.make b/settings.make
index 2a0b183d4a7a032a28c2c20de85b999ece31ef2e..ff917b18392e26f16f2a26624e691f6461588ad8 100644 (file)
--- a/settings.make
+++ b/settings.make
@@ -42,6 +42,7 @@ confdir=$(etcdir)/$(us)
 bindir=$(prefix)/bin
 sbindir=$(prefix)/sbin
 sharedir=$(prefix)/share/$(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)
 txtdocdir=$(prefix)/share/doc/$(us)
 exampledir=$(txtdocdir)/examples
 vardir=$(varlib)/$(us)