mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
96 lines
3.4 KiB
Diff
96 lines
3.4 KiB
Diff
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -345,7 +345,6 @@
|
|
AC_CHECK_PROGS(INSTALL_INFO, install-info)
|
|
AC_CHECK_TOOLS(AR, ar gar)
|
|
AC_CHECK_PROGS(MAKEINFO, makeinfo)
|
|
-AC_CHECK_PROGS(GZIP_PROGRAM, gzip)
|
|
|
|
if test -z "$MAKEINFO" -o -z "$GZIP_PROGRAM"; then
|
|
build_doc="No (requires makeinfo and gzip to build documents)"
|
|
--- a/doc/Makefile.in
|
|
+++ b/doc/Makefile.in
|
|
@@ -19,7 +19,6 @@
|
|
INSTALL_INFO = @INSTALL_INFO@
|
|
MKINSTDIR = $(top_srcdir)/mkinstalldirs
|
|
MAKEINFO = @MAKEINFO@
|
|
-GZIP_PROGRAM = @GZIP_PROGRAM@
|
|
VERSION_INFO = @PACKAGE_STRING@
|
|
PREPROCESSOR = $(top_srcdir)/lib/tools/docprep
|
|
|
|
@@ -61,7 +60,7 @@
|
|
texi html htmls dvi pdf info epub \
|
|
clean distclean maintainer-clean
|
|
|
|
-.SUFFIXES: .texi .html .info.gz .pdf .dvi .epub
|
|
+.SUFFIXES: .texi .html .info .pdf .dvi .epub
|
|
|
|
all: info
|
|
|
|
@@ -77,7 +76,7 @@
|
|
$(INSTALL_INFO) gauche-refj.info.gz "$(infodir)/dir" ; \
|
|
fi; \
|
|
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 \
|
|
$(INSTALL_DATA) *.info* "$(DESTDIR)$(infodir)/"; \
|
|
fi
|
|
|
|
@@ -114,8 +113,8 @@
|
|
%-draft/index.html : %.texi
|
|
$(MAKEDOC) htmls $< "$(MAKEINFO)" "Development HEAD DRAFT"
|
|
|
|
-%.info.gz : %.texi
|
|
- $(MAKEDOC) info $< "$(MAKEINFO)" "$(GZIP_PROGRAM)"
|
|
+%.info : %.texi
|
|
+ $(MAKEDOC) info $< "$(MAKEINFO)"
|
|
|
|
%.pdf : %.texi
|
|
$(MAKEDOC) pdf $< "$(MAKEINFO)"
|
|
@@ -137,7 +136,7 @@
|
|
htmls-draft : gauche-refe-draft/index.html gauche-refj-draft/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
|
|
epub : gauche-refe.epub gauche-refj.epub
|
|
|
|
gauche-refe.texi : $(TEXIS) $(PREPROCESSOR)
|
|
--- 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)]
|
|
@@ -28,7 +28,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")
|
|
@@ -57,14 +57,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 "-n" ,info ,@(glob #"~|info|-[0-9]*"))))))))
|
|
+ (and (do-process (make-cmd `(,makeinfo ,input))))))
|
|
|
|
(define (do-html input makeinfo)
|
|
(or (string-null? makeinfo)
|