1
0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00

[svn] Don't attempt to use Emacs as a susbtitute for makeinfo.

This commit is contained in:
hniksic 2003-11-08 16:24:56 -08:00
parent c92e54ce02
commit 35e205ef2f
3 changed files with 13 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2003-11-09 Hrvoje Niksic <hniksic@xemacs.org>
* configure.in: Don't attempt to use Emacs as a makeinfo
substitute.
2003-11-07 Hrvoje Niksic <hniksic@xemacs.org> 2003-11-07 Hrvoje Niksic <hniksic@xemacs.org>
* README: Remove explicit version reference, so that the file * README: Remove explicit version reference, so that the file

View File

@ -546,17 +546,14 @@ dnl internationalization macros
WGET_WITH_NLS WGET_WITH_NLS
dnl dnl
dnl Find makeinfo. If makeinfo is not found, look for Emacs. If dnl Find makeinfo. We used to provide support for Emacs processing
dnl Emacs cannot be found, look for XEmacs. dnl Texinfo using `emacs -batch -eval ...' where makeinfo is
dnl unavailable, but that broke with the addition of makeinfo-specific
dnl command-line options, such as `-I'. Now we depend on makeinfo to
dnl build the Info documentation.
dnl dnl
AC_CHECK_PROGS(MAKEINFO, makeinfo emacs xemacs) AC_CHECK_PROGS(MAKEINFO, makeinfo)
case "${MAKEINFO}" in
*makeinfo) MAKEINFO="${MAKEINFO} \$(srcdir)/wget.texi" ;;
*emacs | *xemacs) MAKEINFO="${MAKEINFO} -batch -q -no-site-file -eval '(find-file \"\$(srcdir)/wget.texi\")' -l texinfmt -f texinfo-format-buffer -f save-buffer" ;;
*) MAKEINFO="makeinfo \$(srcdir)/wget.texi" ;;
esac
dnl dnl
dnl Find perl and pod2man dnl Find perl and pod2man

View File

@ -65,8 +65,8 @@ everything: all wget_us.ps wget_a4.ps wget_toc.html
$(SAMPLERCTEXI): $(srcdir)/sample.wgetrc $(SAMPLERCTEXI): $(srcdir)/sample.wgetrc
sed s/@/@@/g $? > $@ sed s/@/@@/g $? > $@
wget.info: $(SAMPLERCTEXI) $(srcdir)/wget.texi wget.info: $(srcdir)/wget.texi $(SAMPLERCTEXI)
$(MAKEINFO) -I$(srcdir) $(MAKEINFO) -I$(srcdir) $<
$(TEXI2POD): $(TEXI2POD).in $(TEXI2POD): $(TEXI2POD).in
sed 's,^#! /usr/bin/perl,#! @PERL@,' $? > $@ sed 's,^#! /usr/bin/perl,#! @PERL@,' $? > $@