Update.

1998-07-17  Ulrich Drepper  <drepper@cygnus.com>

	* debug/catchsegv.sh: Fix several stupid bugs.

	* shlib-versions: Define version for libSegFault.
	* debug/Makefile: Replace shared lib version number while rewriting.

1998-07-17  Mark Kettenis  <kettenis@phys.uva.nl>

	* sysdeps/mach/hurd/dl-sysdep.c (__mmap): Add sanity check.
	Suggested by Roland McGrath.

1998-07-15  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* timezone/Makefile: Remove '-L (leapseconds)' for testdata
	generation to control environment.

1998-07-17 09:21  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/sysv4/solaris2/bits/signum.h: Define SIG_HOLD.
	Patch by John Tobey <jtobey@banta-im.com>.

	* manual/llio.texi: Document readv/writev and mmap functions.
	Patch by Michael Deutschmann <michael@talamasca.wkpowerlink.com>.

1998-07-16  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* manual/Makefile (texis): Depend on texis.awk.
	(nonexamples): Filter out add-on chapters.
	(chapters.% top-menu.%): Depend on libc-texinfo.sh.
	(stamp-summary): Depend on $(texis) except summary.texi.
	($(inst_infodir)/libc.info): Simplify command.
	* manual/libc-texinfo.sh: Cleaned up to use less temporary files.
	Fix the generation of the detailed node listing to make it
	complete again.
	* manual/math.texi: Fix signature of lgamma_r.

1 files changed, 15 insertions, 20 deletions

diff --git a/manual/Makefile b/manual/Makefile
index 8af1d6c1a2..47656c6c7f 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -48,35 +48,32 @@ endif
 mkinstalldirs = $(..)scripts/mkinstalldirs
 
 chapters = $(addsuffix .texi, \
-	   intro errno memory ctype string mbyte locale message search	\
-	   pattern io stdio llio filesys pipe socket terminal math	\
-	   arith time setjmp signal startup process job nss users	\
-	   sysinfo conf)
-add-chapters = $(wildcard $(patsubst %, ../%.texi, \
-		 $(join $(add-ons:=/),$(add-ons))))
+		       intro errno memory ctype string mbyte locale	\
+		       message search pattern io stdio llio filesys	\
+		       pipe socket terminal math arith time setjmp	\
+		       signal startup process job nss users sysinfo conf)
+add-chapters = $(wildcard $(foreach d, $(add-ons), ../$d/$d.texi))
 appendices = lang.texi header.texi install.texi maint.texi contrib.texi
 
 -include texis
-texis: $(chapters) $(add-chapters) $(appendices) lgpl.texinfo
-	$(AWK) -f texis.awk $^ > $@.T
+texis: texis.awk $(chapters) $(add-chapters) $(appendices) lgpl.texinfo
+	$(AWK) -f $^ > $@.T
 	mv -f $@.T $@
 
-nonexamples = $(filter-out %.c.texi, $(texis))
+nonexamples = $(filter-out $(add-chapters) %.c.texi, $(texis))
 examples = $(filter %.c.texi, $(texis))
 
 # Kludge: implicit rule so Make knows the one command does it all.
-chapters.% top-menu.%: $(texis)
-	AWK=$(AWK) $(SHELL) libc-texinfo.sh \
-	'$(chapters)' '$(add-chapters)' '$(appendices)'
+chapters.% top-menu.%: libc-texinfo.sh $(texis)
+	AWK=$(AWK) $(SHELL) $< '$(chapters)' '$(add-chapters)' '$(appendices)'
 
 libc.dvi libc.info: chapters.texi top-menu.texi
 libc.dvi: texinfo.tex
 
 # Generate the summary from the Texinfo source files for each chapter.
 summary.texi: stamp-summary ;
-stamp-summary: summary.awk $(chapters) $(chapters-incl)
-	$(AWK) -f $^ \
-	| sort -df +1 -2 | tr '\014' '\012' > summary-tmp
+stamp-summary: summary.awk $(filter-out summary.texi, $(texis))
+	$(AWK) -f $^ | sort -df +1 -2 | tr '\014' '\012' > summary-tmp
 	$(move-if-change) summary-tmp summary.texi
 	touch $@
 
@@ -106,8 +103,8 @@ dir-add.texinfo: xtract-typefun.awk $(texis)
 	$(TEXI2DVI) $<
 
 # Distribution.
-minimal-dist =  summary.awk texis.awk libc-texinfo.sh libc.texinfo	\
-		$(filter-out summary.texi, $(nonexamples))		\
+minimal-dist = summary.awk texis.awk libc-texinfo.sh libc.texinfo	\
+	       $(filter-out summary.texi, $(nonexamples))		\
 	       $(patsubst %.c.texi,examples/%.c, $(examples))
 
 doc-only-dist = Makefile COPYING.LIB
@@ -170,9 +167,7 @@ install-%: ;
 
 $(inst_infodir)/libc.info: libc.info installdirs
 	for file in $<*; do \
-	  name=`basename $$file`; \
-	  $(INSTALL_DATA) $$file \
-	    `echo $@ | sed "s,$<\$$,$$name,"`; \
+	  $(INSTALL_DATA) $$file $(@D)/$$file; \
 	done
 
 installdirs: