chiark / gitweb /
introduce watershed.txt
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Jun 2012 00:45:28 +0000 (01:45 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 6 Jun 2012 00:45:28 +0000 (01:45 +0100)
.gitignore
cprogs/Makefile
cprogs/watershed.c
debian/changelog

index fa3ec36..26ff752 100644 (file)
@@ -12,6 +12,7 @@ cprogs/xacpi-simple
 cprogs/mcastsoundd
 cprogs/summer
 cprogs/watershed
+cprogs/watershed.txt
 cprogs/rcopy-repeatedly
 
 debian/tmp
index e9f19e0..a936e64 100644 (file)
@@ -21,6 +21,8 @@
 # with this program; if not, consult the Free Software Foundation's
 # website at www.fsf.org, or the GNU Project website at www.gnu.org.
 
+us=    chiark-utils-bin
+
 include ../settings.make
 
 RWBUFFER_SIZE_MB=16
@@ -31,8 +33,10 @@ SUIDSBINPROGRAMS=    really
 DAEMONS=               trivsoundd
 MAN1PAGES=             readbuffer.1 writebuffer.1 with-lock-ex.1
 MAN8PAGES=             trivsoundd.8 really.8
+BUILTTXTDOCS=          watershed.txt
+TXTDOCS=               $(BUILTTXTDOCS)
 
-TARGETS=       $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS)
+TARGETS=       $(PROGRAMS) $(SUIDSBINPROGRAMS) $(DAEMONS) $(BUILTTXTDOCS)
 
 all:           $(TARGETS)
 
@@ -56,6 +60,9 @@ rcopy-repeatedly: rcopy-repeatedly.o myopt.o
 watershed:     watershed.o
                $(CC) -o $@ $< -lnettle -lgmp
 
+watershed.txt: watershed.c
+               sed '/^$$/,$$d' <$^ >$@.new && mv -f $@.new $@
+
 install:               all
                $(INSTALL_DIRECTORY) $(bindir) $(sbindir)
                $(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)
@@ -63,10 +70,11 @@ install:            all
                $(INSTALL) -m 4774 -o root -g $(SYSTEM_GROUP) \
                        $(SUIDSBINPROGRAMS) $(sbindir)
 
-install-docs:
+install-docs:  watershed.txt
                $(INSTALL_DIRECTORY) $(man1dir) $(man8dir) $(txtdocdir)
                $(INSTALL) -m 644 $(MAN1PAGES) ${man1dir}/.
                $(INSTALL) -m 644 $(MAN8PAGES) ${man8dir}/.
+               $(INSTALL) -m 644 $(TXTDOCS) ${txtdocdir}/.
 
 install-examples:
 
index dfc9480..3bf9b07 100644 (file)
@@ -296,7 +296,8 @@ static int cohort_fd, lock_fd;
 
 static void badusage(void) {
   fputs(_("usage: watershed [<options>] <command>...\n"
-         "options: -d|--state-dir <directory>  -i|--command-id <id>\n"),
+         "options: -d|--state-dir <directory>  -i|--command-id <id>\n"
+         "see /usr/share/doc/chiark-utils-bin/watershed.txt\n"),
          stderr);
   exit(127);
 }
index 4ed6596..46a4bb8 100644 (file)
@@ -1,5 +1,9 @@
 chiark-utils (4.1.31~~iwj) unstable; urgency=low
 
+  * watershed now installs its head doc comment in
+    /usr/share/doc/chiark-utils-bin/watershed.txt.
+    This is apropos of #659989 but is of course not a proper fix.
+
   * chiark-backup Suggests chiark-utils-bin, not the nonexistent
     chiark-cprogs (for `summer').
   * Fix the build-depends to refer to nettle-dev not libnettle-dev.