aboutsummaryrefslogtreecommitdiff
path: root/manual
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-05 12:26:43 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-05 12:26:43 +0000
commitc00160817df41d1581b2e91620c4adb5cba19a74 (patch)
treee7e6ddc0f298f9bfeae879caca98d760cd284d01 /manual
parenta92599eaa0f2564251b794649cd531c6cb3b0bf3 (diff)
downloadglibc-c00160817df41d1581b2e91620c4adb5cba19a74.tar
glibc-c00160817df41d1581b2e91620c4adb5cba19a74.tar.gz
glibc-c00160817df41d1581b2e91620c4adb5cba19a74.tar.bz2
glibc-c00160817df41d1581b2e91620c4adb5cba19a74.zip
Update.
1998-11-05 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/fpu/bits/mathinline.h (__pow2): Fix fldl -> fld. * sysdeps/libm-i387/s_fma.S: Optimize a bit. * sysdeps/libm-i387/s_fmaf.S: Likewise. 1998-11-04 19:47 -0500 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Search for install-info and substitute it. Determine whether install-info is the buggy Debian version that doesn't understand INFO-DIR-SECTION. * config.make.in: Add INSTALL_INFO and OLD_DEBIAN_INSTALL_INFO to be substituted. * manual/Makefile: If OLD_DEBIAN_INSTALL_INFO, give install-info the --section argument it needs to work properly. (dir-add.texinfo): Delete target. (dir-add.info): Generate this directly. Sort entries. Put a colon at the end of the INFO-DIR-SECTION line. * manual/libc.texinfo: Put a colon at the end of the @dircategory line. 1998-11-05 Paul Eggert <eggert@twinsun.com> * time/mktime.c (__mktime_internal): Adopt the traditional (and problematic) notion of what to do when tm_isdst doesn't match. 1998-11-04 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * posix/PTESTS: Fix spelling. 1998-11-04 Andreas Jaeger <aj@arthur.rhein-neckar.de> * elf/dlopenold.c: Compile only if DO_VERSIONING is also defined. 1998-11-03 H.J. Lu <hjl@gnu.org> * libio/fileops.c (new_do_write): New function. (_IO_new_do_write): Call new_do_write. (_IO_new_file_xsputn): Likewise. * libio/oldfileops.c (old_do_write): New function. (_IO_old_do_write): Call old_do_write. (_IO_old_file_xsputn): Likewise.
Diffstat (limited to 'manual')
-rw-r--r--manual/Makefile27
-rw-r--r--manual/libc.texinfo2
2 files changed, 22 insertions, 7 deletions
diff --git a/manual/Makefile b/manual/Makefile
index 538bb29a9c..5db6a31f23 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -81,11 +81,11 @@ stamp-summary: summary.awk $(filter-out summary.texi, $(texis))
# Generate a file which can be added to the `dir' content to provide direct
# access to the documentation of the function, variables, and other
# definitions.
-dir-add.texinfo: xtract-typefun.awk $(texis)
- (echo "@dircategory GNU C library functions"; \
- echo "@direntry"; \
- $(AWK) -f $^; \
- echo "@end direntry") > $@.new
+dir-add.info: xtract-typefun.awk $(texis)
+ (echo "INFO-DIR-SECTION GNU C library functions:"; \
+ echo "START-INFO-DIR-ENTRY"; \
+ $(AWK) -f $^ | sort; \
+ echo "END-INFO-DIR-ENTRY") > $@.new
mv -f $@.new $@
# Generate Texinfo files from the C source for the example programs.
@@ -156,12 +156,27 @@ realclean: distclean
.PHONY: install subdir_install installdirs install-data
install-data subdir_install: install
ifneq ($(strip $(MAKEINFO)),)
+# There are two variants of install-info out there. The GNU version
+# knows about the INFO-DIR-SECTION tag, the Debian version doesn't.
+ifneq ($(OLD_DEBIAN_INSTALL_INFO),yes)
install: $(inst_infodir)/libc.info dir-add.info
@if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \
- test -f $(inst_infodir)/dir || cp dir $(inst_infodir);\
+ test -f $(inst_infodir)/dir || cp dir $(inst_infodir);\
$(INSTALL_INFO) --info-dir=$(inst_infodir) $(inst_infodir)/libc.info;\
$(INSTALL_INFO) --info-dir=$(inst_infodir) dir-add.info;\
else : ; fi
+else
+install: $(inst_infodir)/libc.info dir-add.info
+ @if $(SHELL) -c '$(INSTALL_INFO) --version' >/dev/null 2>&1; then \
+ test -f $(inst_infodir)/dir || cp dir $(inst_infodir);\
+ $(INSTALL_INFO) --info-dir=$(inst_infodir) \
+ --section '^GNU Libraries:' 'GNU Libraries:' \
+ $(inst_infodir)/libc.info;\
+ $(INSTALL_INFO) --info-dir=$(inst_infodir) \
+ --section '^GNU C Library functions:' 'GNU C Library functions:' \
+ dir-add.info;\
+ else : ; fi
+endif
endif
# Catchall implicit rule for other installation targets from the parent.
install-%: ;
diff --git a/manual/libc.texinfo b/manual/libc.texinfo
index 0beec66fd6..b9d3d7a6d9 100644
--- a/manual/libc.texinfo
+++ b/manual/libc.texinfo
@@ -5,7 +5,7 @@
@setchapternewpage odd
@comment Tell install-info what to do.
-@dircategory GNU libraries
+@dircategory GNU libraries:
@direntry
* Libc: (libc). C library.
@end direntry