Merge changes between r18165 and r18362 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@18363 7b3dc134-2b1b-0410-93df-9e9f96275f8d

2 files changed, 5 insertions, 46 deletions

diff --git a/libc/manual/Makefile b/libc/manual/Makefile
index 85ffec2b7..89fe3b29b 100644
--- a/libc/manual/Makefile
+++ b/libc/manual/Makefile
@@ -30,14 +30,9 @@ dvi: libc.dvi
 pdf: libc.pdf
 
 # Get glibc's configuration info.
-ifneq (,$(wildcard ../Makeconfig))
 include ../Makeconfig
-else
-MAKEINFO = makeinfo
-TEXI2DVI = texi2dvi
-AWK = gawk
-endif
 
+TEXI2DVI = texi2dvi
 TEXI2PDF = texi2dvi --pdf
 
 ifneq ($(strip $(MAKEINFO)),:)
@@ -45,10 +40,6 @@ all: info
 info: libc.info
 endif
 
-# scripts we use
-ifndef move-if-change
-move-if-change = ./move-if-change
-endif
 mkinstalldirs = $(..)scripts/mkinstalldirs
 
 chapters = $(addsuffix .texi, \
@@ -154,27 +145,6 @@ minimal-dist = summary.awk texis.awk tsort.awk libc-texinfo.sh libc.texinfo \
 	       $(filter-out summary.texi, $(nonexamples))		    \
 	       $(patsubst %.c.texi,examples/%.c, $(examples))
 
-tar-it = tar chovf $@ $^
-
-edition := $(shell sed -n 's/^@set EDITION \([0-9][0-9.]*\)[^0-9.]*.*$$/\1/p' \
-		       libc.texinfo)
-
-glibc-doc-$(edition).tar: $(doc-only-dist) $(distribute)
-	@rm -f glibc-doc-$(edition)
-	ln -s . glibc-doc-$(edition)
-	tar chovf $@ $(addprefix glibc-doc-$(edition)/,$^)
-	rm -f glibc-doc-$(edition)
-
-%.Z: %
-	compress -c $< > $@.new
-	mv -f $@.new $@
-%.gz: %
-	gzip -9 -c $< > $@.new
-	mv -f $@.new $@
-%.uu: %
-	uuencode $< < $< > $@.new
-	mv -f $@.new $@
-
 .PHONY: mostlyclean distclean realclean clean
 mostlyclean:
 	-rm -f libc.dvi libc.pdf libc.tmp libc.info*
@@ -209,17 +179,6 @@ $(inst_infodir)/libc.info: libc.info installdirs
 installdirs:
 	$(mkinstalldirs) $(inst_infodir)
 
-.PHONY: dist
-dist: # glibc-doc-$(edition).tar.gz
-
-ifneq (,$(wildcard ../Make-dist))
-dist: ../Make-dist
-	$(MAKE) -f $< $(Make-dist-args)
-endif
-
-ifndef ETAGS
-ETAGS = etags -T
-endif
 TAGS: $(minimal-dist)
 	$(ETAGS) -o $@ $^
 
diff --git a/libc/manual/install.texi b/libc/manual/install.texi
index 967af65b3..655654429 100644
--- a/libc/manual/install.texi
+++ b/libc/manual/install.texi
@@ -7,10 +7,10 @@
 @c %MENU% How to install the GNU C Library
 @appendix Installing @theglibc{}
 
-Before you do anything else, you should read the file @file{FAQ} located
-at the top level of the source tree.  This file answers common questions
-and describes problems you may experience with compilation and
-installation.  It is updated more frequently than this manual.
+Before you do anything else, you should read the FAQ at
+@url{http://sourceware.org/glibc/wiki/FAQ}.  It answers common
+questions and describes problems you may experience with compilation
+and installation.
 
 Features can be added to @theglibc{} via @dfn{add-on} bundles.  These are
 separate tar files, which you unpack into the top level of the source