--- configure.orig	2009-11-03 07:31:18.000000000 -0800
+++ configure	2009-12-29 23:25:57.000000000 -0800
@@ -851,10 +851,7 @@
 libdir
 psdir
 pdfdir
-dvidir
-htmldir
 infodir
-docdir
 oldincludedir
 includedir
 localstatedir
@@ -949,12 +946,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
 libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'
 mandir='${datarootdir}/man'
@@ -1029,11 +1021,6 @@
     esac
     eval enable_$ac_useropt=no ;;
 
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
   -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
     ac_prev=dvidir ;;
   -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
@@ -1334,7 +1321,7 @@
 # Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		oldincludedir infodir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
@@ -15561,10 +15548,6 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-if test "x$docdir" = "x" ; then
-  docdir=$datadir/doc
-fi
-
 # Check whether --enable-subdirs was given.
 if test "${enable_subdirs+set}" = set; then :
   enableval=$enable_subdirs; gemrb_use_subdirs=$enableval
@@ -19890,11 +19873,6 @@
     "gemrb/plugins/WEDImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WEDImporter/Makefile" ;;
     "gemrb/plugins/WMPImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WMPImporter/Makefile" ;;
     "gemrb/plugins/ZLibMgr/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/ZLibMgr/Makefile" ;;
-    "gemrb/docs/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/Makefile" ;;
-    "gemrb/docs/en/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Makefile" ;;
-    "gemrb/docs/en/GUIScript/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/GUIScript/Makefile" ;;
-    "gemrb/docs/en/Tables/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Tables/Makefile" ;;
-    "gemrb/docs/en/Engine/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Engine/Makefile" ;;
     "gemrb.spec") CONFIG_FILES="$CONFIG_FILES gemrb.spec" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
