--- configure.orig	2009-06-25 09:36:53.000000000 -0700
+++ configure	2009-07-07 14:58:31.000000000 -0700
@@ -896,10 +896,7 @@
 libdir
 psdir
 pdfdir
-dvidir
-htmldir
 infodir
-docdir
 oldincludedir
 includedir
 localstatedir
@@ -993,12 +990,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'
@@ -1074,11 +1066,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=*)
@@ -1384,7 +1371,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
@@ -16386,10 +16373,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
@@ -25919,7 +25902,7 @@
 
 
 
-ac_config_files="$ac_config_files Makefile gemrb/Makefile gemrb/includes/Makefile gemrb/override/Makefile gemrb/override/bg1/Makefile gemrb/override/bg2/Makefile gemrb/override/how/Makefile gemrb/override/iwd/Makefile gemrb/override/iwd2/Makefile gemrb/override/pst/Makefile gemrb/override/test1/Makefile gemrb/GUIScripts/Makefile gemrb/GUIScripts/bg1/Makefile gemrb/GUIScripts/bg2/Makefile gemrb/GUIScripts/iwd/Makefile gemrb/GUIScripts/iwd2/Makefile gemrb/GUIScripts/pst/Makefile gemrb/GUIScripts/test1/Makefile gemrb/plugins/Makefile gemrb/plugins/Core/Makefile gemrb/plugins/2DAImporter/Makefile gemrb/plugins/ACMImporter/Makefile gemrb/plugins/AREImporter/Makefile gemrb/plugins/BAMImporter/Makefile gemrb/plugins/BIFImporter/Makefile gemrb/plugins/BMPImporter/Makefile gemrb/plugins/PNGImporter/Makefile gemrb/plugins/CHUImporter/Makefile gemrb/plugins/CREImporter/Makefile gemrb/plugins/DLGImporter/Makefile gemrb/plugins/EFFImporter/Makefile gemrb/plugins/FXOpcodes/Makefile gemrb/plugins/IWDOpcodes/Makefile gemrb/plugins/PSTOpcodes/Makefile gemrb/plugins/GAMImporter/Makefile gemrb/plugins/GUIScript/Makefile gemrb/plugins/IDSImporter/Makefile gemrb/plugins/INIImporter/Makefile gemrb/plugins/ITMImporter/Makefile gemrb/plugins/KEYImporter/Makefile gemrb/plugins/MOSImporter/Makefile gemrb/plugins/MUSImporter/Makefile gemrb/plugins/MVEPlayer/Makefile gemrb/plugins/NullSound/Makefile gemrb/plugins/OpenALAudio/Makefile gemrb/plugins/PLTImporter/Makefile gemrb/plugins/PROImporter/Makefile gemrb/plugins/SDLVideo/Makefile gemrb/plugins/SPLImporter/Makefile gemrb/plugins/STOImporter/Makefile gemrb/plugins/TISImporter/Makefile gemrb/plugins/TLKImporter/Makefile gemrb/plugins/WEDImporter/Makefile gemrb/plugins/WMPImporter/Makefile gemrb/plugins/ZLibMgr/Makefile gemrb/docs/Makefile gemrb/docs/en/Makefile gemrb/docs/en/GUIScript/Makefile gemrb/docs/en/Tables/Makefile gemrb/docs/en/Engine/Makefile"
+ac_config_files="$ac_config_files Makefile gemrb/Makefile gemrb/includes/Makefile gemrb/override/Makefile gemrb/override/bg1/Makefile gemrb/override/bg2/Makefile gemrb/override/how/Makefile gemrb/override/iwd/Makefile gemrb/override/iwd2/Makefile gemrb/override/pst/Makefile gemrb/override/test1/Makefile gemrb/GUIScripts/Makefile gemrb/GUIScripts/bg1/Makefile gemrb/GUIScripts/bg2/Makefile gemrb/GUIScripts/iwd/Makefile gemrb/GUIScripts/iwd2/Makefile gemrb/GUIScripts/pst/Makefile gemrb/GUIScripts/test1/Makefile gemrb/plugins/Makefile gemrb/plugins/Core/Makefile gemrb/plugins/2DAImporter/Makefile gemrb/plugins/ACMImporter/Makefile gemrb/plugins/AREImporter/Makefile gemrb/plugins/BAMImporter/Makefile gemrb/plugins/BIFImporter/Makefile gemrb/plugins/BMPImporter/Makefile gemrb/plugins/PNGImporter/Makefile gemrb/plugins/CHUImporter/Makefile gemrb/plugins/CREImporter/Makefile gemrb/plugins/DLGImporter/Makefile gemrb/plugins/EFFImporter/Makefile gemrb/plugins/FXOpcodes/Makefile gemrb/plugins/IWDOpcodes/Makefile gemrb/plugins/PSTOpcodes/Makefile gemrb/plugins/GAMImporter/Makefile gemrb/plugins/GUIScript/Makefile gemrb/plugins/IDSImporter/Makefile gemrb/plugins/INIImporter/Makefile gemrb/plugins/ITMImporter/Makefile gemrb/plugins/KEYImporter/Makefile gemrb/plugins/MOSImporter/Makefile gemrb/plugins/MUSImporter/Makefile gemrb/plugins/MVEPlayer/Makefile gemrb/plugins/NullSound/Makefile gemrb/plugins/OpenALAudio/Makefile gemrb/plugins/PLTImporter/Makefile gemrb/plugins/PROImporter/Makefile gemrb/plugins/SDLVideo/Makefile gemrb/plugins/SPLImporter/Makefile gemrb/plugins/STOImporter/Makefile gemrb/plugins/TISImporter/Makefile gemrb/plugins/TLKImporter/Makefile gemrb/plugins/WEDImporter/Makefile gemrb/plugins/WMPImporter/Makefile gemrb/plugins/ZLibMgr/Makefile"
 
 ac_config_files="$ac_config_files gemrb.spec"
 
@@ -26977,11 +26960,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_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
