aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog16
-rw-r--r--manual/Makefile43
2 files changed, 17 insertions, 42 deletions
diff --git a/ChangeLog b/ChangeLog
index 1a55bd7..558c156 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-23 Andreas Jaeger <aj@suse.de>
+
+ [BZ #13739]
+ * manual/Makefile: Remove make dist support, there's no
+ need for a stand-alone documentation tar ball.
+ (TEXI2DVI): Define always, it's not in Makeconfig.
+ (dist): Removed.
+ (tar-it): Removed.
+ (edition): Removed.
+ (glibc-doc-$(edition).tar): Removed
+ (%.Z): Removed.
+ (%.gz): Removed.
+ (%.uu): Removed.
+ (ETAGS): Remove, it's in Makeconfig.
+ (move-if-change): Remove, it's in Makeconfig.
+
2013-04-23 Paul Eggert <eggert@cs.ucla.edu>
[BZ #13970]
diff --git a/manual/Makefile b/manual/Makefile
index daddd29..29e36c2 100644
--- a/manual/Makefile
+++ b/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, \
@@ -145,27 +136,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*
@@ -200,17 +170,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 $@ $^