diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | 13ea39a34766fcbecd96ab94bcdf798b08e9bb60 (patch) | |
| tree | 1e1463b03838a6f36868a4dafc7e652358a51857 /doc | |
| parent | 1f8d504f631531c199d7c6154a0dc442d80ea4a7 (diff) | |
| parent | 7e15f3d69a83a34ac62cbbee944a0bfbfa92724e (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile | 10 | ||||
| -rw-r--r-- | doc/hurd.texi | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/Makefile b/doc/Makefile index 707f3304..0c00976c 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -18,8 +18,7 @@ dir := doc makemode := misc -DIST_FILES := navigating gpl.texinfo hurd.texi version.texi \ - hurd.info $(wildcard hurd.info-*) +DIST_FILES := navigating gpl.texinfo hurd.texi version.texi targets = hurd.info $(wildcard hurd.info-*) installationdir = $(infodir) @@ -56,3 +55,10 @@ stamp-version: $(top_srcdir)/Makeconf echo '@set VERSION $(hurd-version)' > version.texi.new $(move-if-change) version.texi.new version.texi touch $@ + +# XXX: the default lndist target will try to look for target files +# in the source directory. Special case them. +lndist: lndist-info-targets +lndist-info-targets: hurd.info $(wildcard hurd.info-*) + ln $? $(top_srcdir)/hurd-snap/$(dir) + diff --git a/doc/hurd.texi b/doc/hurd.texi index 098bebf2..ea73a4c6 100644 --- a/doc/hurd.texi +++ b/doc/hurd.texi @@ -1759,7 +1759,7 @@ new reference port. (FIXME: xref the C library manual for information on how to send sig_post messages.) The server then sends one @code{SIGIO} signal to each registered async -user everytime I/O becomes possible. I/O is possible if at least one +user every time I/O becomes possible. I/O is possible if at least one byte can be read or written immediately. The definition of ``immediately'' must be the same as for the implementation of the @code{O_NONBLOCK} flag (@pxref{Open Modes}). In addition, every time a |