diff -Nur lorg/INSTALLATION lynx2-8-6/INSTALLATION
--- lorg/INSTALLATION	Fri Sep  1 18:50:27 2006
+++ lynx2-8-6/INSTALLATION	Fri Sep  1 18:42:33 2006
@@ -33,7 +33,7 @@
   and there are others you may want to change.
 
   Lynx MUST be able to find lynx.cfg at start-up: using configure
-  (e.g. with UNIX or Cygwin), its location is best set with --libdir ;
+  (e.g. with UNIX or Cygwin), its location is best set with --sysconfdir ;
   you can check in lynx_cfg.h after configure has run, if you wish.
   otherwise, you can use LYNX_CFG_FILE in userdefs.h ,
   environment variable LYNX_CFG or the -cfg command-line option.
@@ -478,10 +478,10 @@
 	For this release of Lynx, we recommend the ncursew library built from
 	ncurses 5.5.
 
-  --libdir				(affect LYNX_CFG_FILE)
+  --sysconfdir				(affect LYNX_CFG_FILE)
 	Defines the location where you want the lynx.cfg file installed.
 	The configure script defines the symbol LYNX_CFG_FILE to correspond
-	with the $libdir environment variable.  (For platforms which do not
+	with the $sysconfdir environment variable.  (For platforms which do not
 	support a configure script, such as MS-DOS, Win32 and VMS, you must
 	edit userdefs.h if you wish to specify the location of lynx.cfg).
 
@@ -689,7 +689,7 @@
 	setenv CPPFLAGS "-I$HOME/slang -I$HOME/.usr/include"
 	setenv LIBS "-L$HOME/.slang/lib -L$HOME/.usr/lib"
 	./configure --exec-prefix=$HOME --bindir=$HOME/.lynx \
-		--mandir=$HOME/.usr/man --libdir=$HOME/.usr/lib \
+		--mandir=$HOME/.usr/man --sysconfdir=$HOME/.usr/lib \
 		--with-screen=slang --with-zlib
 
     CPPFLAGS in this example defines the full path to the slang and zlib header
@@ -697,7 +697,7 @@
     the nonstandard locations of libslang.a and libz.a.  Setting the option
     --bindir tells the configure script where I want to install the lynx
     binary; setting --mandir tells it where to put the lynx.1 man page, and
-    setting --libdir tells it (while at the same time defining LYNX_CFG_FILE)
+    setting --sysconfdir tells it (while at the same time defining LYNX_CFG_FILE)
     where to put the configuration file "lynx.cfg", when I type "make install".
     The --with-screen=slang and --with-zlib options are explained above.
 
@@ -1175,7 +1175,7 @@
     --enable-file-upload \
     --enable-nested-tables \
     --enable-nls \
-    --libdir=d:/djgpp/lynx-rel/lynx-cnf \
+    --sysconfdir=d:/djgpp/lynx-rel/lynx-cnf \
     --with-bzlib \
     --with-zlib \
     --with-ssl
diff -Nur lorg/config.hin lynx2-8-6/config.hin
--- lorg/config.hin	Fri Sep  1 18:50:29 2006
+++ lynx2-8-6/config.hin	Fri Sep  1 18:43:04 2006
@@ -175,8 +175,8 @@
 #undef LOCALE			/* for locale support */
 #undef LONG_LIST		/* CF_ARG_DISABLE(long-list) */
 #undef LYNXCGI_LINKS		/* CF_ARG_ENABLE(cgi-links) */
-#undef LYNX_CFG_FILE		/* $libdir/lynx.cfg */
-#undef LYNX_LSS_FILE		/* $libdir/lynx.lss */
+#undef LYNX_CFG_FILE		/* $sysconfdir/lynx.cfg */
+#undef LYNX_LSS_FILE		/* $sysconfdir/lynx.lss */
 #undef LYNX_RAND_MAX		/* CF_SRAND */
 #undef LY_FIND_LEAKS		/* CF_ARG_ENABLE(find-leaks) */
 #undef LY_TRACELINE		/* CF_ARG_ENABLE(vertrace) */
diff -Nur lorg/configure lynx2-8-6/configure
--- lorg/configure	Fri Sep  1 18:50:31 2006
+++ lynx2-8-6/configure	Fri Sep  1 18:44:49 2006
@@ -712,7 +712,7 @@
                           ncurses, ncursesw, pdcurses or slang)
   --with-curses-dir=DIR   directory in which (n)curses is installed
   --with-cfg-file{=path}  specify the default configuration file
-                          (default: LIBDIR/lynx.cfg)
+                          (default: SYSCONFDIR/lynx.cfg)
   --with-charsets=list    limit charsets to given list of MIME names
 Experimental Options:
   --disable-bibp-urls     disable support for bibp: URLs
@@ -725,7 +725,7 @@
   --enable-japanese-utf8  use experimental Japanese UTF-8 logic
   --disable-color-style   use color style (ncurses/curses)
   --with-lss-file{=path}  specify the default style-sheet file
-                          (default: LIBDIR/lynx.lss)
+                          (default: SYSCONFDIR/lynx.lss)
   --enable-default-colors enable use of default-colors (ncurses/slang)
   --enable-htmlized-cfg   build experimental htmlized lynx.cfg
   --enable-ipv6           use experimental ipv6 (with ipv4) support
@@ -14341,7 +14341,7 @@
   withval="$with_cfg_file"
 
 else
-  withval="${LYNX_CFG_FILE-$libdir/lynx.cfg}"
+  withval="${LYNX_CFG_FILE-$sysconfdir/lynx.cfg}"
 fi;
 case ".$withval" in #(vi
 .\$\(*\)*|.\'*\'*) #(vi
@@ -18616,7 +18616,7 @@
   withval="$with_lss_file"
 
 else
-  withval="${LYNX_LSS_FILE-$libdir/lynx.lss}"
+  withval="${LYNX_LSS_FILE-$sysconfdir/lynx.lss}"
 fi;
 case ".$withval" in #(vi
 .\$\(*\)*|.\'*\'*) #(vi
diff -Nur lorg/configure.in lynx2-8-6/configure.in
--- lorg/configure.in	Fri Sep  1 18:50:33 2006
+++ lynx2-8-6/configure.in	Fri Sep  1 18:45:42 2006
@@ -500,8 +500,8 @@
 [  --with-cfg-file{=path}  specify the default configuration file
                          ],
 LYNX_CFG_FILE,
-LIBDIR/lynx.cfg,
-$libdir/lynx.cfg)
+SYSCONFDIR/lynx.cfg,
+$sysconfdir/lynx.cfg)
 
 AC_MSG_RESULT($LYNX_CFG_FILE)
 
@@ -748,8 +748,8 @@
 [  --with-lss-file{=path}  specify the default style-sheet file
                          ],
 LYNX_LSS_FILE,
-LIBDIR/lynx.lss,
-$libdir/lynx.lss)
+SYSCONFDIR/lynx.lss,
+$sysconfdir/lynx.lss)
 
 	AC_MSG_RESULT($LYNX_LSS_FILE)
 
diff -Nur lorg/docs/OS-390.announce lynx2-8-6/docs/OS-390.announce
--- lorg/docs/OS-390.announce	Fri Sep  1 18:50:42 2006
+++ lynx2-8-6/docs/OS-390.announce	Fri Sep  1 18:41:39 2006
@@ -43,7 +43,7 @@
   The definitions select the ANSI C compiler (c89) and options
   to select the right header file directories.  You may also
   find it useful to set the installation directories with
-  the --prefix=, --libdir=, and --exec_prefix= options.
+  the --prefix=, --sysconfdir=, and --exec_prefix= options.
 
 ========================================================================
 o Build Lynx
diff -Nur lorg/makefile.in lynx2-8-6/makefile.in
--- lorg/makefile.in	Fri Sep  1 18:50:34 2006
+++ lynx2-8-6/makefile.in	Fri Sep  1 19:01:17 2006
@@ -56,15 +56,15 @@
 MANDIR= $(DESTDIR)$(mandir)
 
 ## Where you want the lynx.cfg file installed
-libdir= @libdir@
-LIBDIR= $(DESTDIR)$(libdir)
+sysconfdir= @sysconfdir@
+SYSCONFDIR= $(DESTDIR)$(sysconfdir)
 
 ## Where you want the doc-files installed
-docdir= @libdir@/lynx_doc
+docdir= @datadir@/lynx_doc
 DOCDIR= $(DESTDIR)$(docdir)
 
 ## Where you want the help-files installed
-helpdir= @libdir@/lynx_help
+helpdir= @datadir@/lynx_help
 HELPDIR= $(DESTDIR)$(helpdir)
 
 ##set the relative location of the WWW library Implementation directory,
@@ -360,23 +360,23 @@
 		if test "$(COMPRESS_PROG)" != "" ; then \
 			(cd $(HELPDIR) && $(COMPRESS_PROG) $$files ) \
 		fi'
-	@echo Updating $(libdir)/lynx.cfg
-	@address@hidden(SHELL) -c 'if test -f $(LIBDIR)/lynx.cfg ; then \
-		mv $(LIBDIR)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
+	@echo Updating $(sysconfdir)/lynx.cfg
+	@address@hidden(SHELL) -c 'if test -f $(SYSCONFDIR)/lynx.cfg ; then \
+		mv $(SYSCONFDIR)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
 	else \
-		cp $(srcdir)/lynx.cfg $(LIBDIR)/lynx.tmp ; \
+		cp $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.tmp ; \
 	fi'
-	@echo Updating $(libdir)/lynx.cfg to point to installed help-files
+	@echo Updating $(sysconfdir)/lynx.cfg to point to installed help-files
 	@address@hidden	-e '/^HELPFILE:http/s!^!#!' \
 		-e '/^#HELPFILE:file/s!#!!' \
-		$(LIBDIR)/lynx.tmp | \
+		$(SYSCONFDIR)/lynx.tmp | \
 	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_help $(helpdir) | \
 	$(SHELL) $(scripts_dir)/cfg_path.sh lynx_doc  $(helpdir) | \
 	sed	-e '/^HELPFILE:file/s!$$!$(COMPRESS_EXT)!' \
 		-e '/^HELPFILE:file/s!$(COMPRESS_EXT)$(COMPRESS_EXT)$$!$(COMPRESS_EXT)!' \
-		>$(LIBDIR)/lynx.cfg
-	chmod 644 $(LIBDIR)/lynx.cfg
-	-rm -f $(LIBDIR)/lynx.tmp
+		>$(SYSCONFDIR)/lynx.cfg
+	chmod 644 $(SYSCONFDIR)/lynx.cfg
+	-rm -f $(SYSCONFDIR)/lynx.tmp
 
 LYHelp.h : help_files.sed LYHelp.hin
 	@echo Creating $@
@@ -397,19 +397,19 @@
 	@rm -f $@
 	$(SHELL) -c 'SHELL=$(SHELL) $(SHELL) $(scripts_dir)/cfg_defs.sh $(srcdir)'
 
-install-cfg : $(LIBDIR)
-	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(LIBDIR)/lynx.cfg
+install-cfg : $(SYSCONFDIR)
+	@$(SHELL) $(scripts_dir)/install-cfg.sh "$(INSTALL_DATA)" $(srcdir)/lynx.cfg $(SYSCONFDIR)/lynx.cfg
 
-install-lss : $(LIBDIR)
-	-mv -f $(LIBDIR)/lynx.lss $(LIBDIR)/lynx.oldlss
-	$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(LIBDIR)/lynx.lss
+install-lss : $(SYSCONFDIR)
+	-mv -f $(SYSCONFDIR)/lynx.lss $(SYSCONFDIR)/lynx.oldlss
+	$(INSTALL_DATA) $(srcdir)/samples/lynx.lss $(SYSCONFDIR)/lynx.lss
 
 uninstall ::
 @MSG_DIR_MAKE@	cd po && $(MAKE) CC="$(CC)" uninstall
 	-rm -f $(BINDIR)/lynx$x
 	-rm -f $(MANDIR)/lynx.1
-	-rm -f $(LIBDIR)/lynx.cfg
-	-rm -f $(LIBDIR)/lynx.lss
+	-rm -f $(SYSCONFDIR)/lynx.cfg
+	-rm -f $(SYSCONFDIR)/lynx.lss
 
 uninstall \
 uninstall-help ::
@@ -422,7 +422,7 @@
 
 $(BINDIR) \
 $(MANDIR) \
-$(LIBDIR) \
+$(SYSCONFDIR) \
 $(HELPDIR) \
 $(DOCDIR) :
 	$(SHELL) $(MKINSTALLDIRS) $@