nothing

diff --git a/Makefile.in b/Makefile.in
index 36ae30e30c91898b9f0b588f40272d192e93bbf6..53bbe9a50933de61a65c4601c434e7c4a179be2f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -79,8 +79,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =  automake aclocal
 SCRIPTS =  $(bin_SCRIPTS) $(pkgdata_SCRIPTS)
 
-MAKEINFO = @MAKEINFO@
+MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
+TEXINFO_TEX = $(srcdir)/texinfo.tex
 INFO_DEPS = automake.info
 DVIS = automake.dvi
 TEXINFOS = automake.texi
@@ -204,7 +205,8 @@ DVIPS = dvips
          && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
 
 .texinfo.dvi:
-       TEXINPUTS=$(srcdir):$$TEXINPUTS $(TEXI2DVI) $<
+       TEXINPUTS=$(srcdir):$$TEXINPUTS \
+         MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
 .dvi.ps:
        $(DVIPS) $< -o $@
 

diff --git a/configure b/configure
index 9d2ee9598ca006ea87dc32ca420ddb59f5390f3e..5ea87e54f7404de968db70ee62b44ac4c54fee1e 100755 (executable)
--- a/configure
+++ b/configure
@@ -832,10 +832,8 @@ EOF
 # So, don't put newlines in cache variables' values.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-# /bin/sh on HP-UX has a bug that causes it to die if backquotes used
-# in a case generate too much data.  So we grep out the part we need.
 (set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  case `(ac_space=' '; set) 2>&1` in
   *ac_space=\ *)
     # `set' does not quote correctly, so add quotes (double-quote substitution
     # turns \\\\ into \\, and sed turns \\ into \).