1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
--- a/configure.ac
+++ b/configure.ac
@@ -417,7 +417,6 @@
AC_CHECK_PROGS(AR, ar gar)
AC_CHECK_PROGS(AS, as gas)
AC_CHECK_PROGS(MAKEINFO, makeinfo)
-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
dnl for cross build
AC_CHECK_PROGS(BUILD_CC, ${build}-gcc ${build_alias}-gcc gcc cc)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -16,7 +16,6 @@
INSTALL_DATA = @INSTALL_DATA@
MKINSTDIR = $(top_srcdir)/mkinstalldirs
MAKEINFO = @MAKEINFO@
-GZIP_PROGRAM = @GZIP_PROGRAM@
VERSION_INFO = @PACKAGE_STRING@
MAKEDOC = $(GOSH) $(srcdir)/makedoc.scm
@@ -58,7 +57,7 @@
texi html htmls dvi pdf info \
clean distclean maintainer-clean
-.SUFFIXES: .texi .html .info.gz .pdf .dvi
+.SUFFIXES: .texi .html .info .pdf .dvi
all: info
@@ -66,7 +65,7 @@
if test ! -d "$(DESTDIR)$(mandir)/man1"; then $(MKINSTDIR) "$(DESTDIR)$(mandir)/man1"; fi
$(INSTALL_DATA) $(MANPAGES) "$(DESTDIR)$(mandir)/man1"
if test ! -d "$(DESTDIR)$(infodir)"; then $(MKINSTDIR) "$(DESTDIR)$(infodir)"; fi
- if test -f gauche-refe.info.gz -o -f gauche-refj.info.gz; then \
+ if test -f gauche-refe.info -o -f gauche-refj.info; then \
for info in *.info*; do \
$(INSTALL_DATA) $$info "$(DESTDIR)$(infodir)/"; \
done; \
@@ -94,8 +93,8 @@
%/index.html : %.texi
$(MAKEDOC) htmls $< "$(MAKEINFO)" "$(VERSION_INFO)"
-%.info.gz : %.texi
- $(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
+%.info : %.texi
+ $(MAKEDOC) info $< "$(MAKEINFO)"
%.pdf : %.texi
$(MAKEDOC) pdf $< "$(MAKEINFO)"
@@ -113,7 +112,7 @@
htmls : gauche-refe/index.html gauche-refj/index.html
dvi : gauche-refe.dvi gauche-refj.dvi
pdf : gauche-refe.pdf gauche-refj.pdf
-info : gauche-refe.info.gz gauche-refj.info.gz
+info : gauche-refe.info gauche-refj.info
gauche-refe.texi : $(TEXIS) extract.scm
$(GOSH) $(srcdir)/extract.scm -en -o gauche-refe.texi $(srcdir)/gauche-ref.texi
--- a/doc/makedoc.scm
+++ b/doc/makedoc.scm
@@ -16,7 +16,7 @@
[gauche.sys.setenv (sys-putenv "LANG=C")]
[else])
(if (match (cdr args)
- [("info" input makeinfo gzip) (do-info input makeinfo gzip)]
+ [("info" input makeinfo) (do-info input makeinfo)]
[("html" input makeinfo) (do-html input makeinfo)]
[("htmls" input makeinfo version) (do-htmls input makeinfo version)]
[("pdf" input makeinfo) (do-pdf input makeinfo)]
@@ -27,7 +27,7 @@
(define (usage)
(print "Usage: gosh makedoc.scm command args ...")
(print "Valid commands (and args):")
- (print " info input MAKEINFO GZIP - generate info doc")
+ (print " info input MAKEINFO - generate info doc")
(print " html input MAKEINFO - generate single html")
(print " htmls input MAKEINFO VERSION-STRING - generate html files in subdir")
(print " pdf input MAKEINFO - generate pdf")
@@ -55,14 +55,11 @@
(warn "makeinfo version ~a or greater is required, but ~a's \
version is ~a. Skipping.\n" min-version makeinfo vers)))))
-(define (do-info input makeinfo gzip)
+(define (do-info input makeinfo)
(define info (path-swap-extension input "info"))
(or (string-null? makeinfo)
- (string-null? gzip)
(not (check-makeinfo-version makeinfo "5.0"))
- (and (do-process (make-cmd `(,makeinfo ,input)))
- (begin (remove-files (glob #"~|info|*.gz"))
- (do-process (make-cmd `(,gzip ,info ,@(glob #"~|info|-[0-9]*"))))))))
+ (and (do-process (make-cmd `(,makeinfo ,input))))))
(define (do-html input makeinfo)
(or (string-null? makeinfo)
|
