2 files changed, 4 insertions, 24 deletions

diff --git a/autogen/Makefile.in b/autogen/Makefile.in
index 4ea9aeb3561..e86bfe0468e 100644
--- a/autogen/Makefile.in
+++ b/autogen/Makefile.in
@@ -423,11 +423,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DEPFLAGS = @DEPFLAGS@
 DESLIB = @DESLIB@
-DOCMISC_DVI_W32 = @DOCMISC_DVI_W32@
-DOCMISC_HTML_W32 = @DOCMISC_HTML_W32@
-DOCMISC_INFO_W32 = @DOCMISC_INFO_W32@
-DOCMISC_PDF_W32 = @DOCMISC_PDF_W32@
-DOCMISC_PS_W32 = @DOCMISC_PS_W32@
+DOCMISC_W32 = @DOCMISC_W32@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
diff --git a/autogen/configure b/autogen/configure
index 28c57222a1d..e38c18a303e 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -1397,11 +1397,7 @@ UNEXEC_OBJ
 C_SWITCH_MACHINE
 LD_SWITCH_SYSTEM
 CANNOT_DUMP
-DOCMISC_PS_W32
-DOCMISC_PDF_W32
-DOCMISC_INFO_W32
-DOCMISC_HTML_W32
-DOCMISC_DVI_W32
+DOCMISC_W32
 INFO_OPTS
 INFO_EXT
 HAVE_MAKEINFO
@@ -8761,25 +8757,13 @@ INFO_OPTS=--no-split
 
 
 if test $opsys = mingw32; then
-   DOCMISC_DVI_W32=efaq-w32.dvi
-   DOCMISC_HTML_W32=efaq-w32.html
-   DOCMISC_INFO_W32=efaq-w32.info
-   DOCMISC_PDF_W32=efaq-w32.pdf
-   DOCMISC_PS_W32=efaq-w32.ps
+   DOCMISC_W32=efaq-w32
 else
-   DOCMISC_DVI_W32=
-   DOCMISC_HTML_W32=
-   DOCMISC_INFO_W32=
-   DOCMISC_PDF_W32=
-   DOCMISC_PS_W32=
+   DOCMISC_W32=
 fi
 
 
 
-
-
-
-
 if test x$GCC = xyes; then
   test "x$GCC_LINK_TEST_OPTIONS" != x && \
     ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"