snapshot of project "lynx", label v2-7-1ac_0-47

author: Thomas E. Dickey <dickey@invisible-island.net> 1997-08-07 14:35:47 -0400
committer: Thomas E. Dickey <dickey@invisible-island.net> 1997-08-07 14:35:47 -0400
commit: 29e32111a2573cf7ecc9cd1d09dbf7dedd15dfcd (patch)
tree: eb21837aa9b85afaaf8381d71600e1e6dfe78cb3
parent: a93eca0b83e4d890c28d271eb3293f08666c613e (diff)
download: lynx-snapshots-29e32111a2573cf7ecc9cd1d09dbf7dedd15dfcd.tar.gz
17 files changed, 539 insertions, 441 deletions
diff --git a/.Lynx.prcs_aux b/.Lynx.prcs_aux
index 719a6ddd..20149403 100644
--- a/.Lynx.prcs_aux
+++ b/.Lynx.prcs_aux
@@ -1,7 +1,7 @@
 ;; This file is automatically generated, editing may cause PRCS to do
 ;; REALLY bad things.
 (Created-By-Prcs-Version 1 2 0)
-(WWW/Library/djgpp/makefile 857 861154810 0_makefile 1.4)
+(WWW/Library/djgpp/makefile 843 870960374 0_makefile 1.5)
 (WWW/Library/Implementation/HTList.c 6153 856833014 h/4_HTList.c 1.1)
 (WWW/Library/Implementation/HTGroup.h 5641 856833014 f/49_HTGroup.h 1.1)
 (src/tcpwareolb.opt 24 856833014 d/8_tcpwareolb 1.1)
@@ -27,7 +27,7 @@
 (utils/inews/conf.h 3797 870050175 c/3_conf.h 1.1.1.2)
 (WWW/README.txt 9430 856833014 e/47_README.txt 1.1)
 (WWW/Library/Implementation/HTCJK.h 2933 860064663 f/30_HTCJK.h 1.2)
-(src/LYDownload.c 16884 868567209 c/47_LYDownload 1.1.4.1.1.2)
+(src/LYDownload.c 16921 870960374 c/47_LYDownload 1.1.4.1.1.3)
 (WWW/Library/apollo_m68k/Makefile 723 856833014 f/19_Makefile 1.1)
 (src/chrtrans/cp852_uni.tbl 11362 860516309 i/6_cp852_uni. 1.2)
 (test/ISO_LATIN1_test.html 3608 856833014 c/14_ISO_LATIN1 1.1)
@@ -40,8 +40,8 @@
 (src/chrtrans/cp1252_uni.tbl 10789 856856948 h/51_cp1252_uni 1.1)
 (utils/inews/config.h-dist 13461 856833014 b/51_config.h-d 1.1)
 (WWW/Library/Implementation/HTFTP.c 91171 868775901 h/14_HTFTP.c 1.6)
-(src/GridText.c 188036 870708759 e/5_GridText.c 1.1.3.1.1.1.1.1.1.2.2.2.1.2.1.2.1.1.1.1.1.1.1.2)
-(src/LYMain.c 87227 870708759 d/44_LYMain.c 1.1.2.1.1.1.1.1.1.2.2.1.1.1.1.1.1.1.1.1.1.1.1.4)
+(src/GridText.c 188036 870960374 e/5_GridText.c 1.1.3.1.1.1.1.1.1.2.2.2.1.2.1.2.1.1.1.1.1.1.1.3)
+(src/LYMain.c 87250 870960374 d/44_LYMain.c 1.1.2.1.1.1.1.1.1.2.2.1.1.1.1.1.1.1.1.1.1.1.1.5)
 (src/tcpwareshr.opt 30 856833014 d/6_tcpwareshr 1.1)
 (src/LYGetFile.c 35566 870708759 d/48_LYGetFile. 1.5.2.3.2.1.1.1.1.1.1.1.1.2)
 (src/chrtrans/iso05_uni.tbl 1865 856925688 i/8_iso05_uni. 1.2)
@@ -67,10 +67,11 @@
 (WWW/Library/Implementation/HTAAProt.h 7708 856833014 f/46_HTAAProt.h 1.1)
 (lynx_help/keystroke_commands/gopher_types_help.html 1091 856833014 e/26_gopher_typ 1.1)
 (WWW/Library/Implementation/HTVMSUtils.h 2354 856833014 f/39_HTVMSUtils 1.1)
-(src/LYExtern.c 1988 868400879 39_LYExtern.c 1.5.1.1)
+(src/LYExtern.c 2223 870960374 39_LYExtern.c 1.5.1.2)
 (LYMessages_en.h 32688 870708759 h/37_LYMessages 1.4.1.4.1.2.1.1.1.1.1.1.3.1.1.2)
 (lynx_help/keystroke_commands/keystroke_help.html 5115 868266973 e/28_keystroke_ 1.3.1.2)
 (WWW/Library/umaxv-m88k/Makefile 678 856833014 e/48_Makefile 1.1)
+(about_lynx/lynx-dev.html 2500 870960374 b/0_lynx-dev.h 1.1)
 (WWW/Library/Implementation/HTBTree.c 26907 856833014 h/15_HTBTree.c 1.1)
 (src/LYCookie.c 70031 870708759 c/18_LYCookie.c 1.2.1.6.1.2)
 (src/LYExtern.h 174 868719652 38_LYExtern.h 1.1.1.1)
@@ -102,7 +103,7 @@
 (utils/lpansi/lpansi.c 4570 856833014 b/49_lpansi.c 1.1)
 (src/chrtrans/iso09_uni.tbl 857 856925688 i/11_iso09_uni. 1.2)
 (src/HTAlert.h 3283 869443761 d/1_HTAlert.h 1.3)
-(lynx_help/lynx_help_main.html 2726 868922448 e/29_lynx_help_ 1.3)
+(lynx_help/lynx_help_main.html 2720 870960374 e/29_lynx_help_ 1.4)
 (src/LYUtils.h 4016 868401363 d/34_LYUtils.h 1.1.2.3)
 (src/LYCharUtils.h 2338 868567209 c/19_LYCharUtil 1.1.2.3)
 (WWW/Library/decstation/Makefile 409 856833014 f/18_Makefile 1.1)
@@ -139,7 +140,7 @@
 (src/chrtrans/cp1250_uni.tbl 10813 856856948 h/48_cp1250_uni 1.1)
 (src/decc.opt 58 856833014 d/13_decc.opt 1.1)
 (WWW/Library/Implementation/HTStyle.h 6777 870708759 g/18_HTStyle.h 1.2)
-(CHANGES.new 112369 870708759 6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.8)
+(CHANGES.new 112505 870960374 6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.9)
 (WWW/Library/Implementation/HTMLGen.h 753 856833014 g/22_HTMLGen.h 1.1)
 (WWW/Library/Implementation/HTFormat.h 10965 870159729 g/13_HTFormat.h 1.2)
 (WWW/Library/Implementation/HTUU.h 964 856833014 f/43_HTUU.h 1.1)
@@ -155,14 +156,14 @@
 (WWW/Library/isc/Makefile 679 856833014 e/50_Makefile 1.1)
 (src/LYMap.c 10459 869443761 c/21_LYMap.c 1.1.2.1.1.2.1.2.1.2)
 (src/LYPrint.c 30375 870050175 d/40_LYPrint.c 1.1.1.1.1.1.1.1.1.1.1.3)
-(WWW/Library/Implementation/HTTelnet.c 15458 862109152 h/24_HTTelnet.c 1.4)
-(about_lynx/about_lynx.html 4135 856833014 e/43_about_lynx 1.1)
+(WWW/Library/Implementation/HTTelnet.c 15664 870960374 h/24_HTTelnet.c 1.5)
+(about_lynx/about_lynx.html 4123 870960374 e/43_about_lynx 1.2)
 (samples/mime.types 1057 856833014 e/9_mime.types 1.1)
 (src/HTNestedList.h 1188 856833014 c/30_HTNestedLi 1.1)
 (src/chrtrans/iso10_uni.tbl 1565 856925688 i/10_iso10_uni. 1.2)
 (src/LYMap.h 240 861212923 c/20_LYMap.h 1.2)
 (samples/jumpsVMS.html 1417 856833014 e/7_jumpsVMS.h 1.1)
-(src/LYReadCFG.c 33864 870708759 d/39_LYReadCFG. 1.1.1.1.3.2.3.1.1.2.1.4)
+(src/LYReadCFG.c 33865 870960374 d/39_LYReadCFG. 1.1.1.1.3.2.3.1.1.2.1.5)
 (WWW/Library/vms/descrip.mms 9051 856833014 f/22_descrip.mm 1.1)
 (src/LYPrint.h 304 856833014 d/7_LYPrint.h 1.1)
 (Makefile.old 46150 870708759 h/36_Makefile 1.1.1.1.1.1.1.2.3.1.3.2)
@@ -201,7 +202,7 @@
 (src/LYUpload.h 300 856833014 c/49_LYUpload.h 1.1)
 (lynx_help/keystroke_commands/edit_help.html 1409 856833014 e/17_edit_help. 1.1)
 (src/LYLeaks.c 14715 868401363 c/31_LYLeaks.c 1.1.1.2)
-(src/LYMainLoop.c 145689 870708759 d/43_LYMainLoop 1.2.4.2.2.1.2.6.1.2.1.1.1.1.1.1.1.1.1.1.1.5)
+(src/LYMainLoop.c 145990 870960374 d/43_LYMainLoop 1.2.4.2.2.1.2.6.1.2.1.1.1.1.1.1.1.1.1.1.1.6)
 (about_lynx/about_lynx-dev.html 2500 856833014 e/42_about_lynx 1.1)
 (VMSPrint.com 616 856833014 h/30_VMSPrint.c 1.1)
 (WWW/Library/netbsd/Makefile 613 856833014 f/0_Makefile 1.1)
@@ -273,7 +274,7 @@
 (WWW/Library/Implementation/HTAuth.c 5776 856833014 h/28_HTAuth.c 1.1)
 (lynx.hlp 14941 870708759 e/31_lynx.hlp 1.10.1.2)
 (src/HTSaveToFile.h 554 856833014 c/50_HTSaveToFi 1.1)
-(src/LYCurses.c 39023 869904256 d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.3)
+(src/LYCurses.c 39064 870960374 d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.4)
 (WWW/Library/Implementation/HTInit.h 613 856833014 g/12_HTInit.h 1.1)
 (WWW/Library/Implementation/HTAAServ.h 4950 856833014 g/1_HTAAServ.h 1.1)
 (WWW/Library/mips/Makefile 663 856833014 f/3_Makefile 1.1)
@@ -294,11 +295,11 @@
 (descrip.mms 3765 868451907 e/37_descrip.mm 1.2)
 (WWW/Library/Implementation/HTTP.h 672 869443761 g/34_HTTP.h 1.2)
 (test/TestComment.html 2032 856833014 c/13_TestCommen 1.1)
-(src/makefile.dos 2119 864148507 1_makefile.d 1.5)
+(src/makefile.dos 2183 870960374 1_makefile.d 1.6)
 (WWW/Library/Implementation/HTString.h 1153 856833014 g/16_HTString.h 1.1)
 (WWW/Library/Implementation/Version.make 10 856833014 f/42_Version.ma 1.1)
 (MAKEFILE.W32 17568 862109152 5_MAKEFILE.W 1.2)
-(WWW/Library/djgpp/CommonMakefile 13489 860588360 26_CommonMake 1.1)
+(WWW/Library/djgpp/CommonMakefile 13108 870960374 26_CommonMake 1.2)
 (src/chrtrans/iso03_uni.tbl 1872 856925688 i/16_iso03_uni. 1.2)
 (WWW/Library/Implementation/HTTCP.h 3160 860899928 g/30_HTTCP.h 1.3)
 (src/win_tcp.opt 36 856833014 c/33_win_tcp.op 1.1)
@@ -350,7 +351,7 @@
 (src/LYOptions.h 1290 869904256 d/17_LYOptions. 1.1.2.5)
 (WWW/Library/Implementation/HTNews.h 1150 856833014 g/9_HTNews.h 1.1)
 (src/LYNews.h 240 869443761 c/42_LYNews.h 1.2)
-(CHANGES.chartrans 8128 869904256 c/0_CHANGES.chartrans 1.9.1.4.1.1.1.1.1.4)
+(CHANGES.chartrans 8129 869904256 c/0_CHANGES.chartrans 1.9.1.4.1.1.1.1.1.4)
 (src/UCdomap.c 46232 870159729 b/14_UCdomap.c 1.4)
 (WWW/Library/Implementation/HTACL.h 3535 856833014 f/48_HTACL.h 1.1)
 (IBMPC-charsets.announce 7674 856833014 h/39_IBMPC-char 1.1)
diff --git a/CHANGES.new b/CHANGES.new
index f4cb5c6d..5c262c1d 100644
--- a/CHANGES.new
+++ b/CHANGES.new
@@ -10,6 +10,9 @@ README.configure), and miscellaneous other changes.  Note that the 2.7 ->
 2.7.1 changes (which are listed at the beginning of the current CHANGES
 file) are duplicated here. - KW]
 
+1997-08-07
+* Many minor tweaks for the DJGPP version by DK - WB
+* A rename of about_lynx_dev.html to lynx_dev.html for 8.3 systems - WB
 1997-08-04
 * Fixed header parsing in HTMIME.c so that "Safe:" is recognized. - KW
 * Changed confirmation prompts for HEAD (']') commands acting on a POST
diff --git a/Lynx.prj b/Lynx.prj
index 9a684b6b..f7bf8e78 100644
--- a/Lynx.prj
+++ b/Lynx.prj
@@ -1,13 +1,13 @@
 ;; -*- Lisp -*-
 (Created-By-Prcs-Version 1 2 0)
 (Project-Description "PRCS Project for The Lynx browser")
-(Project-Version Lynx 2.7.1ac-0 46)
-(Parent-Version Lynx 2.7.1ac-0 45)
+(Project-Version Lynx 2.7.1ac-0 47)
+(Parent-Version Lynx 2.7.1ac-0 46)
 
-(Version-Log "update fotemods 1997-08-01, various fixes")
+(Version-Log "DJGPP hacks")
 (New-Version-Log "")
-(Checkin-Time "Mon, 04 Aug 1997 09:32:39 -0600")
-(Checkin-Login kweide)
+(Checkin-Time "Thu, 07 Aug 1997 07:26:14 -0600")
+(Checkin-Login buttles)
 (Populate-Ignore ("\\.o$" "\\.a$" "~$" "^a.out$" "^core$"
                   "\\.dvi$" "\\.aux$" "^\\..*_aux$" "\\.log"
                   "\\.zip$" "^obsolete" "/obsolete"
@@ -76,7 +76,7 @@
   (src/LYCharSets.h (Lynx/c/44_LYCharSets 1.2 644))
   (src/LYCharSets.c (Lynx/c/45_LYCharSets 1.1.1.1.1.2 644))
   (src/LYDownload.h (Lynx/c/46_LYDownload 1.1 644))
-  (src/LYDownload.c (Lynx/c/47_LYDownload 1.1.4.1.1.2 644))
+  (src/LYDownload.c (Lynx/c/47_LYDownload 1.1.4.1.1.3 644))
   (src/HTML.h (Lynx/c/48_HTML.h 1.1.2.2.2.1.1.1.1.3 644))
   (src/LYUpload.h (Lynx/c/49_LYUpload.h 1.1 644))
   (src/HTSaveToFile.h (Lynx/c/50_HTSaveToFi 1.1 644))
@@ -120,12 +120,12 @@
   (src/LYStrings.c (Lynx/d/36_LYStrings. 1.1.3.3.2.7 644))
   (src/LYShowInfo.c (Lynx/d/37_LYShowInfo 1.1.2.1.2.8 644))
   (src/LYSearch.c (Lynx/d/38_LYSearch.c 1.2.2.5 644))
-  (src/LYReadCFG.c (Lynx/d/39_LYReadCFG. 1.1.1.1.3.2.3.1.1.2.1.4 644))
+  (src/LYReadCFG.c (Lynx/d/39_LYReadCFG. 1.1.1.1.3.2.3.1.1.2.1.5 644))
   (src/LYPrint.c (Lynx/d/40_LYPrint.c 1.1.1.1.1.1.1.1.1.1.1.3 644))
   (src/LYOptions.c (Lynx/d/41_LYOptions. 1.1.2.1.1.1.1.1.1.3.1.2 644))
   (src/LYNews.c (Lynx/d/42_LYNews.c 1.7 644))
-  (src/LYMainLoop.c (Lynx/d/43_LYMainLoop 1.2.4.2.2.1.2.6.1.2.1.1.1.1.1.1.1.1.1.1.1.5 644))
-  (src/LYMain.c (Lynx/d/44_LYMain.c 1.1.2.1.1.1.1.1.1.2.2.1.1.1.1.1.1.1.1.1.1.1.1.4 644))
+  (src/LYMainLoop.c (Lynx/d/43_LYMainLoop 1.2.4.2.2.1.2.6.1.2.1.1.1.1.1.1.1.1.1.1.1.6 644))
+  (src/LYMain.c (Lynx/d/44_LYMain.c 1.1.2.1.1.1.1.1.1.2.2.1.1.1.1.1.1.1.1.1.1.1.1.5 644))
   (src/LYMail.c (Lynx/d/45_LYMail.c 1.1.1.1.1.1.3.1.1.1.2.2 644))
   (src/LYLocal.c (Lynx/d/46_LYLocal.c 1.2.3.1.3.3 644))
   (src/LYJump.c (Lynx/d/47_LYJump.c 1.3 644))
@@ -138,7 +138,7 @@
   (src/HTML.c (Lynx/e/2_HTML.c 1.1.4.1.1.1.1.2.1.4.1.2.1.3.1.2.1.2.2.3 644))
   (src/HTInit.c (Lynx/e/3_HTInit.c 1.2.1.2 644))
   (src/HTAlert.c (Lynx/e/4_HTAlert.c 1.1.2.3 644))
-  (src/GridText.c (Lynx/e/5_GridText.c 1.1.3.1.1.1.1.1.1.2.2.2.1.2.1.2.1.1.1.1.1.1.1.2 644))
+  (src/GridText.c (Lynx/e/5_GridText.c 1.1.3.1.1.1.1.1.1.2.2.2.1.2.1.2.1.1.1.1.1.1.1.3 644))
   (src/descrip.mms (Lynx/e/6_descrip.mm 1.2 644))
   (samples/jumpsVMS.html (Lynx/e/7_jumpsVMS.h 1.1 644))
   (samples/jumpsUnix.html (Lynx/e/8_jumpsUnix. 1.1 644))
@@ -162,7 +162,7 @@
   (lynx_help/keystroke_commands/gopher_types_help.html (Lynx/e/26_gopher_typ 1.1 644))
   (lynx_help/keystroke_commands/bookmark_help.html (Lynx/e/27_bookmark_h 1.1 644))
   (lynx_help/keystroke_commands/keystroke_help.html (Lynx/e/28_keystroke_ 1.3.1.2 644))
-  (lynx_help/lynx_help_main.html (Lynx/e/29_lynx_help_ 1.3 644))
+  (lynx_help/lynx_help_main.html (Lynx/e/29_lynx_help_ 1.4 644))
   (lynx.man (Lynx/e/30_lynx.man 1.5.2.6.1.2 644))
   (lynx.hlp (Lynx/e/31_lynx.hlp 1.10.1.2 644))
   (lynx.cfg (Lynx/e/32_lynx.cfg 1.2.1.2.1.1.2.1.1.2.1.4 644))
@@ -176,7 +176,7 @@
   (about_lynx/COPYHEADER (Lynx/e/40_COPYHEADER 1.1 644))
   (about_lynx/COPYING (Lynx/e/41_COPYING 1.1 644))
   (about_lynx/about_lynx-dev.html (Lynx/e/42_about_lynx 1.1 644))
-  (about_lynx/about_lynx.html (Lynx/e/43_about_lynx 1.1 644))
+  (about_lynx/about_lynx.html (Lynx/e/43_about_lynx 1.2 644))
   (WWW/Makefile (Lynx/e/44_Makefile 1.1 644))
   (WWW/BUILD (Lynx/e/45_BUILD 1.1 644))
   (WWW/Copyright.txt (Lynx/e/46_Copyright. 1.1 644))
@@ -313,7 +313,7 @@
   (WWW/Library/Implementation/HTWriter.c (Lynx/h/21_HTWriter.c 1.1 644))
   (WWW/Library/Implementation/HTWAIS.c (Lynx/h/22_HTWAIS.c 1.1.1.1 644))
   (WWW/Library/Implementation/HTVMSUtils.c (Lynx/h/23_HTVMSUtils 1.2 644))
-  (WWW/Library/Implementation/HTTelnet.c (Lynx/h/24_HTTelnet.c 1.4 644))
+  (WWW/Library/Implementation/HTTelnet.c (Lynx/h/24_HTTelnet.c 1.5 644))
   (WWW/Library/Implementation/HTNews.c (Lynx/h/25_HTNews.c 1.1.2.2 644))  
   (WWW/Library/Implementation/HTMLDTD.c (Lynx/h/26_HTMLDTD.c 1.1.2.7 644))
   (WWW/Library/Implementation/HTFile.c (Lynx/h/27_HTFile.c 1.1.3.1.1.3 644))
@@ -379,8 +379,8 @@
   (WWW/Library/Implementation/UCMap.h (Lynx/i/22_UCMap.h 1.3 644))
   (WWW/Library/Implementation/UCAux.h (Lynx/f/0_UCAux.h 1.1 644))
 
-  (WWW/Library/djgpp/makefile (Lynx/0_makefile 1.4 644))
-  (src/makefile.dos (Lynx/1_makefile.d 1.5 644))
+  (WWW/Library/djgpp/makefile (Lynx/0_makefile 1.5 644))
+  (src/makefile.dos (Lynx/1_makefile.d 1.6 644))
   (README.win-386 (Lynx/2_386-WIN.TX 1.2 644))
 ;; Files added by populate at Mon, 03 Mar 1997 04:38:33 -0600:
 
@@ -390,7 +390,7 @@
 
 ;; Files added by populate at Mon, 03 Mar 1997 06:05:56 -0600:
 
-  (CHANGES.new (Lynx/6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.8 644))
+  (CHANGES.new (Lynx/6_CHANGES.ne 1.18.1.4.1.1.2.1.1.2.2.2.1.2.1.1.1.1.1.4.2.7.1.3.1.4.1.9 644))
 
 ;; Files added by populate at Tue, 11 Mar 1997 04:22:39 -0600:
 
@@ -406,7 +406,7 @@
 
 ;; Files added by populate at Wed, 09 Apr 1997 06:18:01 -0600:
 
-  (WWW/Library/djgpp/CommonMakefile (Lynx/26_CommonMake 1.1 644))
+  (WWW/Library/djgpp/CommonMakefile (Lynx/26_CommonMake 1.2 644))
   (WWW/Library/Implementation/HTDOS.h (Lynx/27_HTDOS.H 1.1 644))
   (WWW/Library/Implementation/HTDOS.c (Lynx/28_HTDOS.C 1.1 644))
 
@@ -420,7 +420,7 @@
 ;; Files added by populate at Thu, 24 Apr 1997 21:51:47 -0600:
 
   (src/LYExtern.h (Lynx/38_LYExtern.h 1.1.1.1 644))
-  (src/LYExtern.c (Lynx/39_LYExtern.c 1.5.1.1 644))
+  (src/LYExtern.c (Lynx/39_LYExtern.c 1.5.1.2 644))
 
 
   (config.sub (Lynx/30_config.sub 1.1 755))
@@ -436,7 +436,7 @@
   (src/LYStyle.h (Lynx/b/5_LYStyle.h 1.2 644))
 ;; Files added by populate at Tue, 08 Jul 1997 20:40:02 -0600:
 
-  (src/LYCurses.c (Lynx/d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.3 644))
+  (src/LYCurses.c (Lynx/d/51_LYCurses.c 1.1.5.1.1.8.1.4.1.4 644))
   (src/LYCharUtils.c (Lynx/c/22_LYCharUtil 1.2.1.1.2.1.2.2.1.2.1.1.1.2.1.1.1.1.1.3 644))
 
 ;; Files added by populate at Wed, 09 Jul 1997 05:12:01 -0600:
@@ -447,22 +447,10 @@
   (src/chrtrans/build-chrtrans.com (Lynx/b/22_build-chrt 1.2 644))
   (src/chrtrans/build-header.com (Lynx/c/0_build-head 1.1 644))
 
-  (src/chrtrans/cp1251_uni.tbl (Lynx/b/0_cp1251_uni 1.1 644)))
-(Merge-Parents
-  (2.7.1fm-0.37 incomplete
-    (Makefile.old Makefile Makefile m) 
-  )
-  (2.7.1fm-0.37 complete
-    (userdefs.h userdefs.h userdefs.h m) (src/LYCookie.c src/LYCookie.c src/LYCookie.c m)
-    (src/HTFWriter.c src/HTFWriter.c src/HTFWriter.c m) (src/LYGlobalDefs.h src/LYGlobalDefs.h src/LYGlobalDefs.h m)
-    (src/LYUpload.c src/LYUpload.c src/LYUpload.c m) (src/LYReadCFG.c src/LYReadCFG.c src/LYReadCFG.c m)
-    (src/LYOptions.c src/LYOptions.c src/LYOptions.c m) (src/LYMain.c src/LYMain.c src/LYMain.c m)
-    (src/LYMail.c src/LYMail.c src/LYMail.c m) (src/LYGetFile.c src/LYGetFile.c src/LYGetFile.c m)
-    (src/GridText.c src/GridText.c src/GridText.c m) (samples/lynx.cfg samples/lynx.cfg samples/lynx.cfg m)
-    (lynx_help/Lynx_users_guide.html lynx_help/Lynx_users_guide.html lynx_help/Lynx_users_guide.html m) (lynx.man lynx.man lynx.man m)
-    (lynx.hlp lynx.hlp lynx.hlp m) (lynx.cfg lynx.cfg lynx.cfg m)
-    (WWW/Library/Implementation/HTFormat.c WWW/Library/Implementation/HTFormat.c WWW/Library/Implementation/HTFormat.c m) (WWW/Library/Implementation/HTTP.c WWW/Library/Implementation/HTTP.c WWW/Library/Implementation/HTTP.c m)
-    (WWW/Library/Implementation/HTFile.c WWW/Library/Implementation/HTFile.c WWW/Library/Implementation/HTFile.c m) (LYMessages_en.h LYMessages_en.h LYMessages_en.h m)
-    (() FOTEMODS FOTEMODS n) (() 00README 00README n))
+  (src/chrtrans/cp1251_uni.tbl (Lynx/b/0_cp1251_uni 1.1 644))
+;; Files added by populate at Thu, 07 Aug 1997 07:25:30 -0600:
+
+  (about_lynx/lynx-dev.html (Lynx/b/0_lynx-dev.h 1.1 644))
 )
+(Merge-Parents)
 (New-Merge-Parents)
diff --git a/WWW/Library/Implementation/HTTelnet.c b/WWW/Library/Implementation/HTTelnet.c
index a09bc6d8..b8bbc9b1 100644
--- a/WWW/Library/Implementation/HTTelnet.c
+++ b/WWW/Library/Implementation/HTTelnet.c
@@ -183,7 +183,15 @@ PRIVATE int remote_session ARGS2(char *, access, char *, host)
 
 	if (TRACE)
 	    fprintf(stderr, "HTTelnet: Normal: Command is: %s\n\n", command);
+#ifdef __DJGPP__
+       __djgpp_set_ctrl_c(0);
+       _go32_want_ctrl_break(1);
+#endif /* __DJGPP__ */
 	system(command);
+#ifdef __DJGPP__
+       __djgpp_set_ctrl_c(1);
+       _go32_want_ctrl_break(0);
+#endif /* __DJGPP__ */
 	return HT_NO_DATA;		/* Ok - it was done but no data */
 #define TELNET_DONE
 #endif /* !TELNET_DONE */
diff --git a/WWW/Library/djgpp/CommonMakefile b/WWW/Library/djgpp/CommonMakefile
index e0b6a171..8543aaf3 100644
--- a/WWW/Library/djgpp/CommonMakefile
+++ b/WWW/Library/djgpp/CommonMakefile
@@ -1,379 +1,379 @@
-#	Common Makefile for W3 Library Code
-#	-----------------------------------
-#
-#	(c) CERN 1990, 1991 -- see Copyright.html for conditions
-#
-# This file should be invariant between systems.
-#	DEPENDENCIES NOT COMPLETE @@
-#
-#	make		Compile and link the software (private version)
-#	make install	Copy it into the system (implies make)
-#	make update	Copy installed version into installed version
-#	make uninstall	Unlink installed version from the system
-#	make clean	Remove intermediate files
-#	make cleanall	Remove intremediate files and products
-#	
-# Macros required to be defined already for make:
-#
-# CC		The C compiler
-# CFLAGS	Flags for $(CC) -- except the -I which are below
-# LFLAGS	Flags for ld
-# LYFLAGS	Flags for Lynx
-#
-# WWW           The WWW source tree directory
-#
-# Macros needed for make install:
-#
-# LIBDIR	Directory for installed library
-#______________________________________________________________________
-
-#  If this env var is set to something else Some makes will use that instead
-SHELL = /bin/sh
-
-#	.h files are distributed but originally are made from the
-#	self-documenting hypertext files.
-
-.SUFFIXES: .h .html
-.html.h:
-#	- chmod +w $*.h
-	www -w90 -na -to text/x-c $*.html > $*.h
-#	chmod -w $*.h
-
-# If this is actually run in a subdirectory,
-#
-# WWW = ../../..
-# WWW = ../..	For [cernlib] build in this directory
-
-WC = $(WWW)/Library
-CMN = $(WWW)/Library/Implementation/
-VMS = $(CMN)vms
-# Where shall we put the objects and built library?
-
-LOB = $(WTMP)/Library/$(WWW_MACH)
-
-# Only needed if HTWAIS.c is to be compiled. Put into your Makefile.include
-#  uncomment these and fill in WAISINC for adding direct wais access
-#  to Lynx.
-#HTWAIS = $(LOB)/HTWAIS.o
-#WAIS = YES
-#WAISINC = -I../../../../freeWAIS-0.202/ir
-#WAISCFLAGS = -DDIRECT_WAIS 
-#
-
-# This path, if relative, is taken relative to the directory
-# in which this makefile is, not the pwd.  This screws up the 
-# recursive invocation
-# include $(CMN)Version.make
-include $(ABS)$(WWW)/Library/Implementation/Version.make
-
-# XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
-#
-# add -DNEW_GATEWAY here for the new gateway config stuff
-CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH 
-
-CERNLIBBIN = $(WWW)/bin
-
-COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \
-	$(LOB)/HTFile.o	$(LOB)/HTBTree.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \
-	$(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \
-	$(LOB)/HTPlain.o $(LOB)/HTWriter.o \
-	$(LOB)/HTMLGen.o \
-	$(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \
-        $(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTDOS.o \
-	$(LOB)/HTRules.o $(LOB)/HTFormat.o  $(LOB)/HTMIME.o \
-	$(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \
-	$(LOB)/HTTelnet.o $(LOB)/HTFinger.o $(LOB)/HTWSRC.o $(HTWAIS) \
-	$(LOB)/HTAAUtil.o $(LOB)/HTAAServ.o $(LOB)/HTAABrow.o \
-	$(LOB)/HTAAFile.o $(LOB)/HTPasswd.o $(LOB)/HTGroup.o  \
-	$(LOB)/HTACL.o    $(LOB)/HTAuth.o   $(LOB)/HTAAProt.o \
-	$(LOB)/HTAssoc.o  $(LOB)/HTLex.o    $(LOB)/HTUU.o
-
-CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \
-        $(CMN)HTBTree.c \
-	$(CMN)HTFTP.c   $(CMN)HTTCP.c     $(CMN)SGML.c \
-	$(CMN)HTMLDTD.c \
-	$(CMN)HTPlain.c	$(CMN)HTWriter.c  \
-        $(CMN)HTDOS.c  $(CMN)HTMLGen.c \
-	$(CMN)HTChunk.c $(CMN)HTAtom.c   $(CMN)HTAnchor.c $(CMN)HTStyle.c \
-	$(CMN)HTList.c  $(CMN)HTString.c $(CMN)HTRules.c \
-	$(CMN)HTFormat.c $(CMN)HTMIME.c $(CMN)HTHistory.c \
-	$(CMN)HTNews.c  $(CMN)HTGopher.c $(CMN)HTTelnet.c \
-	$(CMN)HTFinger.c $(CMN)HTWAIS.c  $(CMN)HTWSRC.c \
-	$(CMN)HTAAUtil.c $(CMN)HTAAServ.c $(CMN)HTAABrow.c \
-	$(CMN)HTAAFile.c $(CMN)HTPasswd.c $(CMN)HTGroup.c  \
-	$(CMN)HTACL.c    $(CMN)HTAuth.c   $(CMN)HTAAProt.c \
-	$(CMN)HTAssoc.c  $(CMN)HTLex.c    $(CMN)HTUU.c
-
-HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \
-	$(CMN)HTBTree.h $(CMN)HTFTP.h $(CMN)HTTCP.h \
-	$(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \
-	$(CMN)HTPlain.h		$(CMN)HTWriter.h \
-        $(CMN)HTFWriter.h       $(CMN)HTMLGen.h $(CMN)HTDOS.h \
-	$(CMN)HTStream.h \
-	$(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \
-	$(CMN)HTList.h \
-	$(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \
-	$(CMN)HTFormat.h $(CMN)HTInit.h \
-	$(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \
-	$(CMN)HTGopher.h \
-	$(CMN)HTUtils.h $(CMN)tcp.h $(CMN)HText.h \
-	$(CMN)HTTelnet.h $(CMN)HTFinger.h \
-	$(CMN)HTWAIS.h  $(CMN)HTWSRC.h \
-	$(CMN)HTAAUtil.h $(CMN)HTAAServ.h $(CMN)HTAABrow.h \
-	$(CMN)HTAAFile.h $(CMN)HTPasswd.h $(CMN)HTGroup.h  \
-	$(CMN)HTACL.h    $(CMN)HTAuth.h   $(CMN)HTAAProt.h \
-	$(CMN)HTAssoc.h  $(CMN)HTLex.h    $(CMN)HTUU.h
-
-SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make \
-	$(CMN)CommonMakefile $(CMN)Makefile \
-	$(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD $(WWW)/Makefile
-SPECIFIC = $(WWW)/All/*/Makefile.include $(WWW)/All/Implementation/Makefile* \
-	$(VMS)/descrip.mms $(VMS)/build_multinet.com \
-	$(VMS)/COPYING.LIB $(VMS)/setup.com $(VMS)/multinet.opt \
-	$(VMS)/patchlevel.h $(VMS)/ufc-crypt.h \
-	$(VMS)/crypt.c $(VMS)/crypt_util.c \
-	$(VMS)/getline.c $(VMS)/getpass.c \
-	$(VMS)/HTVMSUtils.h $(VMS)/HTVMSUtils.c
-
-
-#	Library
-#
-#  On SGI, ranlib is unnecessary and does not exist so we ignore errors
-# for that step
-$(LOB)/libwww.a : $(COMMON)
-	ar r $(LOB)/libwww.a $(COMMON)
-	-ranlib $(LOB)/libwww.a
-
-#	Clean up everything generatable except final products
-clean :
-	rm $(LOB)/*.o $(LOB)/.created
-	-rmdir $(LOB)
-
-#	Clean up everything generatable including final products
-
-cleanall : clean
-	rm $(LOB)/libwww.a
-
-#	Install W3 library into system space (not normally necessary)
-
-install : libwww.a
-	if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR)
-	cp libwww.a $(LIBDIR)/libwww.a
-	
-uninstall :
-	rm $(LIBDIR)/libwww.a
-
-#		Distribution use only:
-#		----------------------
-
-#	Needs www version 2.4 or later to do this
-inc : $(HFILES)
-	echo Include files generated from hypertext.
-
-binary : /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a
-	echo FTP archive binary Libray $(VC) for $(WWW_MACH) up to date.
-
-
-/pub/www/bin/$(WWW_MACH)/libwww_$(VC).a : libwww.a
-	-mkdir /pub/www/bin/$(WWW_MACH)
-	cp libwww.a /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a
-
-#	Source Distribution:
-
-distribute :  /pub/www/README.txt /pub/www/Copyright.txt
-	(cd $(WWW)/..; WWW=WWW ABS=`pwd`/ make $(MFLAGS) \
-		-f WWW/Library/Implementation/CommonMakefile \
-		/pub/www/src/WWWLibrary_$(VC).tar.Z)
-	(cd ../Implementation; cvs tag \
-	    `sed -e 's/VC = /v/' Version.make | sed -e 's?\.?/?'` )
-	echo Distribution of Library version $(VC) up to date.
-
-/pub/www/src/WWWLibrary_$(VC).tar.Z : $(SOURCES)
-	tar cf /pub/www/src/WWWLibrary_$(VC).tar \
-	    $(SOURCES)  $(SPECIFIC) $(WC)/*/Makefile
-	compress /pub/www/src/WWWLibrary_$(VC).tar
-
-
-#	Hypertext supplied in text format
-#	---------------------------------
-
-$(WWW)/README.txt : $(WWW)/../README.html
-	www -n -p66 http://www.w3.org/hypertext/README.html \
-		> $(WWW)/README.txt
-/pub/www/README.txt : $(WWW)/README.txt
-	cp $(WWW)/README.txt /pub/www/README.txt
-
-$(WWW)/Copyright.txt : $(WWW)/../Copyright.html
-	www -n -p66 http://www.w3.org/hypertext/Copyright.html \
-		> $(WWW)/Copyright.txt
-/pub/www/Copyright.txt : $(WWW)/Copyright.txt
-	cp $(WWW)/Copyright.txt /pub/www/Copyright.txt
-
-# 			Common code
-#			-----------
-
-#	Directory for object files - .created checks it exists
-
-OE = $(LOB)/.created
-$(OE) :
-	if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi
-	if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK ; fi
-	if [ ! -r $(WTMP)/Library/$(WWW_MACH) ] ; \
-		then mkdir $(WTMP)/Library/$(WWW_MACH); else echo OK ; fi
-	touch $@
-
-$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c
-
-$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c
-
-$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c
-
-$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c
-
-$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c
-
-$(LOB)/HTDOS.o : $(OE) $(CMN)HTDOS.c $(CMN)HTUtils.h $(CMN)../../../userdefs.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTDOS.c
-
-$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\
-	 $(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c
-
-$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \
-	 $(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c
-
-$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c
-
-$(LOB)/HTFinger.o : $(OE) $(CMN)HTFinger.c $(CMN)HTUtils.h $(CMN)HTList.h \
-	$(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFinger.c
-
-$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c
-
-$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c
-
-$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c
-
-$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c
-
-$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \
-	 $(CMN)HTAAServ.h $(CMN)HTAAProt.h
-	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c
-
-$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c
-
-$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c
-
-$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c
-
-$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c
-
-$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c
-
-$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c
-
-$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c
-
-
-#	Access Authorization
-
-$(LOB)/HTAAUtil.o : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \
-	 $(CMN)HTUtils.h $(CMN)HTString.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAUtil.c
-
-$(LOB)/HTAAFile.o : $(OE) $(CMN)HTAAFile.c $(CMN)HTAAFile.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTUtils.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAFile.c
-
-$(LOB)/HTPasswd.o : $(OE) $(CMN)HTPasswd.c $(CMN)HTPasswd.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPasswd.c
-
-$(LOB)/HTGroup.o : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \
-	 $(CMN)HTAssoc.h $(CMN)HTLex.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGroup.c
-
-$(LOB)/HTACL.o : $(OE) $(CMN)HTACL.c $(CMN)HTACL.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTGroup.h \
-	 $(CMN)HTAssoc.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTACL.c
-
-$(LOB)/HTAuth.o : $(OE) $(CMN)HTAuth.c $(CMN)HTAuth.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTPasswd.h $(CMN)HTAAFile.h \
-	 $(CMN)HTAssoc.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAuth.c
-
-$(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \
-	$(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTPasswd.h \
-	 $(CMN)HTGroup.h $(CMN)HTACL.h $(CMN)HTAuth.h \
-	 $(CMN)HTUU.h $(CMN)HTParse.h $(CMN)HTList.h \
-	 $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTRules.h \
-	 $(CMN)HTAAProt.h $(CMN)HTAssoc.h $(CMN)HTLex.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAServ.c
-
-$(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \
-	 $(CMN)HTAAUtil.h $(CMN)HTUU.h \
-	 $(CMN)HTUtils.h $(CMN)HTString.h \
-	 $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \
-	 $(CMN)HTAssoc.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c
-
-$(LOB)/HTAAProt.o : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \
-	 $(CMN)HTUtils.h $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \
-	 $(CMN)HTAssoc.h $(CMN)HTLex.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAProt.c
-
-$(LOB)/HTAssoc.o : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \
-	$(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTList.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAssoc.c
-
-$(LOB)/HTLex.o : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTLex.c
-
-$(LOB)/HTUU.o : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTUU.c
-
-
-#	Communications & Files
-
-$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c
-
-$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c
-
-$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \
-	 $(CMN)HTMLDTD.h $(CMN)HTAAServ.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c
-
-$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c
-
-$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c
-
-$(LOB)/HTAccess.o : $(OE)  $(CMN)HTAccess.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c
-
-$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h
-	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c
-
+#	Common Makefile for W3 Library Code
+#	-----------------------------------
+#
+#	(c) CERN 1990, 1991 -- see Copyright.html for conditions
+#
+# This file should be invariant between systems.
+#	DEPENDENCIES NOT COMPLETE @@
+#
+#	make		Compile and link the software (private version)
+#	make install	Copy it into the system (implies make)
+#	make update	Copy installed version into installed version
+#	make uninstall	Unlink installed version from the system
+#	make clean	Remove intermediate files
+#	make cleanall	Remove intremediate files and products
+#	
+# Macros required to be defined already for make:
+#
+# CC		The C compiler
+# CFLAGS	Flags for $(CC) -- except the -I which are below
+# LFLAGS	Flags for ld
+# LYFLAGS	Flags for Lynx
+#
+# WWW           The WWW source tree directory
+#
+# Macros needed for make install:
+#
+# LIBDIR	Directory for installed library
+#______________________________________________________________________
+
+#  If this env var is set to something else Some makes will use that instead
+SHELL = /bin/sh
+
+#	.h files are distributed but originally are made from the
+#	self-documenting hypertext files.
+
+.SUFFIXES: .h .html .htm
+.html.h:
+#	- chmod +w $*.h
+#	www -w90 -na -to text/x-c $*.html > $*.h
+#	chmod -w $*.h
+
+# If this is actually run in a subdirectory,
+#
+WWW = ../..
+# WWW = ../..	For [cernlib] build in this directory
+
+WC = $(WWW)/Library
+CMN = $(WWW)/Library/Implementation/
+VMS = $(CMN)vms
+# Where shall we put the objects and built library?
+
+LOB = $(WTMP)/Library/$(WWW_MACH)
+
+# Only needed if HTWAIS.c is to be compiled. Put into your Makefile.include
+#  uncomment these and fill in WAISINC for adding direct wais access
+#  to Lynx.
+#HTWAIS = $(LOB)/HTWAIS.o
+#WAIS = YES
+#WAISINC = -I../../../../freeWAIS-0.202/ir
+#WAISCFLAGS = -DDIRECT_WAIS 
+#
+
+# This path, if relative, is taken relative to the directory
+# in which this makefile is, not the pwd.  This screws up the 
+# recursive invocation
+# include $(CMN)Version.make
+include $(ABS)$(WWW)/Library/Implementation/Version.make
+
+# XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia
+#
+# add -DNEW_GATEWAY here for the new gateway config stuff
+CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH 
+
+CERNLIBBIN = $(WWW)/bin
+
+COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \
+	$(LOB)/HTFile.o	$(LOB)/HTBTree.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \
+	$(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \
+	$(LOB)/HTPlain.o $(LOB)/HTWriter.o \
+	$(LOB)/HTMLGen.o \
+	$(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \
+        $(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTDOS.o \
+	$(LOB)/HTRules.o $(LOB)/HTFormat.o  $(LOB)/HTMIME.o \
+	$(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \
+	$(LOB)/HTTelnet.o $(LOB)/HTFinger.o $(LOB)/HTWSRC.o $(HTWAIS) \
+	$(LOB)/HTAAUtil.o $(LOB)/HTAAServ.o $(LOB)/HTAABrow.o \
+	$(LOB)/HTAAFile.o $(LOB)/HTPasswd.o $(LOB)/HTGroup.o  \
+	$(LOB)/HTACL.o    $(LOB)/HTAuth.o   $(LOB)/HTAAProt.o \
+	$(LOB)/HTAssoc.o  $(LOB)/HTLex.o    $(LOB)/HTUU.o
+
+CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \
+        $(CMN)HTBTree.c \
+	$(CMN)HTFTP.c   $(CMN)HTTCP.c     $(CMN)SGML.c \
+	$(CMN)HTMLDTD.c \
+	$(CMN)HTPlain.c	$(CMN)HTWriter.c  \
+        $(CMN)HTDOS.c  $(CMN)HTMLGen.c \
+	$(CMN)HTChunk.c $(CMN)HTAtom.c   $(CMN)HTAnchor.c $(CMN)HTStyle.c \
+	$(CMN)HTList.c  $(CMN)HTString.c $(CMN)HTRules.c \
+	$(CMN)HTFormat.c $(CMN)HTMIME.c $(CMN)HTHistory.c \
+	$(CMN)HTNews.c  $(CMN)HTGopher.c $(CMN)HTTelnet.c \
+	$(CMN)HTFinger.c $(CMN)HTWAIS.c  $(CMN)HTWSRC.c \
+	$(CMN)HTAAUtil.c $(CMN)HTAAServ.c $(CMN)HTAABrow.c \
+	$(CMN)HTAAFile.c $(CMN)HTPasswd.c $(CMN)HTGroup.c  \
+	$(CMN)HTACL.c    $(CMN)HTAuth.c   $(CMN)HTAAProt.c \
+	$(CMN)HTAssoc.c  $(CMN)HTLex.c    $(CMN)HTUU.c
+
+HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \
+	$(CMN)HTBTree.h $(CMN)HTFTP.h $(CMN)HTTCP.h \
+	$(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \
+	$(CMN)HTPlain.h		$(CMN)HTWriter.h \
+        $(CMN)HTFWriter.h       $(CMN)HTMLGen.h $(CMN)HTDOS.h \
+	$(CMN)HTStream.h \
+	$(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \
+	$(CMN)HTList.h \
+	$(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \
+	$(CMN)HTFormat.h $(CMN)HTInit.h \
+	$(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \
+	$(CMN)HTGopher.h \
+	$(CMN)HTUtils.h $(CMN)tcp.h $(CMN)HText.h \
+	$(CMN)HTTelnet.h $(CMN)HTFinger.h \
+	$(CMN)HTWAIS.h  $(CMN)HTWSRC.h \
+	$(CMN)HTAAUtil.h $(CMN)HTAAServ.h $(CMN)HTAABrow.h \
+	$(CMN)HTAAFile.h $(CMN)HTPasswd.h $(CMN)HTGroup.h  \
+	$(CMN)HTACL.h    $(CMN)HTAuth.h   $(CMN)HTAAProt.h \
+	$(CMN)HTAssoc.h  $(CMN)HTLex.h    $(CMN)HTUU.h
+
+SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make \
+	$(CMN)CommonMakefile $(CMN)Makefile \
+	$(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD $(WWW)/Makefile
+SPECIFIC = $(WWW)/All/*/Makefile.include $(WWW)/All/Implementation/Makefile* \
+	$(VMS)/descrip.mms $(VMS)/build_multinet.com \
+	$(VMS)/COPYING.LIB $(VMS)/setup.com $(VMS)/multinet.opt \
+	$(VMS)/patchlevel.h $(VMS)/ufc-crypt.h \
+	$(VMS)/crypt.c $(VMS)/crypt_util.c \
+	$(VMS)/getline.c $(VMS)/getpass.c \
+	$(VMS)/HTVMSUtils.h $(VMS)/HTVMSUtils.c
+
+
+#	Library
+#
+#  On SGI, ranlib is unnecessary and does not exist so we ignore errors
+# for that step
+$(LOB)/libwww.a : $(COMMON)
+	ar r $(LOB)/libwww.a $(COMMON)
+	-ranlib $(LOB)/libwww.a
+
+#	Clean up everything generatable except final products
+clean :
+	rm $(LOB)/*.o $(LOB)/created
+	-rmdir $(LOB)
+
+#	Clean up everything generatable including final products
+
+cleanall : clean
+	rm $(LOB)/libwww.a
+
+#	Install W3 library into system space (not normally necessary)
+
+install : libwww.a
+	if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR)
+	cp libwww.a $(LIBDIR)/libwww.a
+	
+uninstall :
+	rm $(LIBDIR)/libwww.a
+
+#		Distribution use only:
+#		----------------------
+
+#	Needs www version 2.4 or later to do this
+inc : $(HFILES)
+	echo Include files generated from hypertext.
+
+binary : /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a
+	echo FTP archive binary Libray $(VC) for $(WWW_MACH) up to date.
+
+
+/pub/www/bin/$(WWW_MACH)/libwww_$(VC).a : libwww.a
+	-mkdir /pub/www/bin/$(WWW_MACH)
+	cp libwww.a /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a
+
+#	Source Distribution:
+
+distribute :  /pub/www/README.txt /pub/www/Copyright.txt
+	(cd $(WWW)/..; WWW=WWW ABS=`pwd`/ make $(MFLAGS) \
+		-f WWW/Library/Implementation/CommonMakefile \
+		/pub/www/src/WWWLibrary_$(VC).tar.Z)
+	(cd ../Implementation; cvs tag \
+	    `sed -e 's/VC = /v/' Version.make | sed -e 's?\.?/?'` )
+	echo Distribution of Library version $(VC) up to date.
+
+/pub/www/src/WWWLibrary_$(VC).tar.Z : $(SOURCES)
+	tar cf /pub/www/src/WWWLibrary_$(VC).tar \
+	    $(SOURCES)  $(SPECIFIC) $(WC)/*/Makefile
+	compress /pub/www/src/WWWLibrary_$(VC).tar
+
+
+#	Hypertext supplied in text format
+#	---------------------------------
+
+$(WWW)/README.txt : $(WWW)/../README.html
+	www -n -p66 http://www.w3.org/hypertext/README.html \
+		> $(WWW)/README.txt
+/pub/www/README.txt : $(WWW)/README.txt
+	cp $(WWW)/README.txt /pub/www/README.txt
+
+$(WWW)/Copyright.txt : $(WWW)/../Copyright.html
+	www -n -p66 http://www.w3.org/hypertext/Copyright.html \
+		> $(WWW)/Copyright.txt
+/pub/www/Copyright.txt : $(WWW)/Copyright.txt
+	cp $(WWW)/Copyright.txt /pub/www/Copyright.txt
+
+# 			Common code
+#			-----------
+
+#	Directory for object files - created checks it exists
+
+OE = $(LOB)/created
+$(OE) :
+	if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi
+	if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK ; fi
+	if [ ! -r $(WTMP)/Library/$(WWW_MACH) ] ; \
+		then mkdir $(WTMP)/Library/$(WWW_MACH); else echo OK ; fi
+	touch $@
+
+$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c
+
+$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c
+
+$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c
+
+$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c
+
+$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c
+
+$(LOB)/HTDOS.o : $(OE) $(CMN)HTDOS.c $(CMN)HTUtils.h $(CMN)../../../userdefs.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTDOS.c
+
+$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\
+	 $(CMN)HTMLDTD.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c
+
+$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \
+	 $(CMN)HTMLDTD.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c
+
+$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c
+
+$(LOB)/HTFinger.o : $(OE) $(CMN)HTFinger.c $(CMN)HTUtils.h $(CMN)HTList.h \
+	$(CMN)HTMLDTD.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFinger.c
+
+$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c
+
+$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c
+
+$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c
+
+$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make
+	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c
+
+$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \
+	 $(CMN)HTAAServ.h $(CMN)HTAAProt.h
+	$(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c
+
+$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c
+
+$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c
+
+$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c
+
+$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c
+
+$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c
+
+$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c
+
+$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c
+
+
+#	Access Authorization
+
+$(LOB)/HTAAUtil.o : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \
+	 $(CMN)HTUtils.h $(CMN)HTString.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAUtil.c
+
+$(LOB)/HTAAFile.o : $(OE) $(CMN)HTAAFile.c $(CMN)HTAAFile.h \
+	 $(CMN)HTAAUtil.h $(CMN)HTUtils.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAFile.c
+
+$(LOB)/HTPasswd.o : $(OE) $(CMN)HTPasswd.c $(CMN)HTPasswd.h \
+	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPasswd.c
+
+$(LOB)/HTGroup.o : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \
+	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \
+	 $(CMN)HTAssoc.h $(CMN)HTLex.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGroup.c
+
+$(LOB)/HTACL.o : $(OE) $(CMN)HTACL.c $(CMN)HTACL.h \
+	 $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTGroup.h \
+	 $(CMN)HTAssoc.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTACL.c
+
+$(LOB)/HTAuth.o : $(OE) $(CMN)HTAuth.c $(CMN)HTAuth.h \
+	 $(CMN)HTAAUtil.h $(CMN)HTPasswd.h $(CMN)HTAAFile.h \
+	 $(CMN)HTAssoc.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAuth.c
+
+$(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \
+	$(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTPasswd.h \
+	 $(CMN)HTGroup.h $(CMN)HTACL.h $(CMN)HTAuth.h \
+	 $(CMN)HTUU.h $(CMN)HTParse.h $(CMN)HTList.h \
+	 $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTRules.h \
+	 $(CMN)HTAAProt.h $(CMN)HTAssoc.h $(CMN)HTLex.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAServ.c
+
+$(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \
+	 $(CMN)HTAAUtil.h $(CMN)HTUU.h \
+	 $(CMN)HTUtils.h $(CMN)HTString.h \
+	 $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \
+	 $(CMN)HTAssoc.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c
+
+$(LOB)/HTAAProt.o : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \
+	 $(CMN)HTUtils.h $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \
+	 $(CMN)HTAssoc.h $(CMN)HTLex.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAProt.c
+
+$(LOB)/HTAssoc.o : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \
+	$(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTList.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAssoc.c
+
+$(LOB)/HTLex.o : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTLex.c
+
+$(LOB)/HTUU.o : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTUU.c
+
+
+#	Communications & Files
+
+$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c
+
+$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c
+
+$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \
+	 $(CMN)HTMLDTD.h $(CMN)HTAAServ.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c
+
+$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c
+
+$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c
+
+$(LOB)/HTAccess.o : $(OE)  $(CMN)HTAccess.c $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c
+
+$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h
+	$(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c
+
diff --git a/WWW/Library/djgpp/makefile b/WWW/Library/djgpp/makefile
index 2d096a16..d3cc446e 100644
--- a/WWW/Library/djgpp/makefile
+++ b/WWW/Library/djgpp/makefile
@@ -5,14 +5,14 @@
 WWW_MACH = djgpp
 
 # The ASIS repository's name for the machine we are on
-ASIS_MACH = hardware/os
+#ASIS_MACH = hardware/os
 
-CFLAGS = -O -DEXP_CHARTRANS -DCOLOR_CURSES -DDOSPATH -DNOUSERS -DDEBUG -I../../../djgpp/tcplib/include -I../../../djgpp/tcplib/include/tcp
+CFLAGS = -O -DCOLOR_CURSES -DDOSPATH -DNOUSERS -DDEBUG -I../../../djgpp/tcplib/include -I../../../djgpp/tcplib/include/tcp
 LFLAGS =
 CC = gcc
 
 # Directory for installed binary:
-BINDIR = /usr/local/bin
+!BINDIR = /usr/local/bin
 
 # Where is the W3 object library to be installed (not normally done)?
 LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH)
diff --git a/about_lynx/about_lynx.html b/about_lynx/about_lynx.html
index a86b588f..33faa7cd 100644
--- a/about_lynx/about_lynx.html
+++ b/about_lynx/about_lynx.html
@@ -7,7 +7,7 @@
 
 <BODY>
 <BANNER>
-[ <A HREF="about_lynx-dev.html">About Lynx-Dev</A> |
+[ <A HREF="lynx-dev.html">About Lynx-Dev</A> |
 <A HREF="http://www.flora.org/lynx-dev/html/">Lynx-Dev Archives</A> ]
 </BANNER>
 
@@ -89,7 +89,7 @@ available via <a href="http://www.crl.com/~subir/lynx.html"
 
 We have a listserv mailing list running for lynx development discussion.
 If you are interested in joining the list, follow this <A
-HREF="about_lynx-dev.html">link</A>.  There also are links to <A
+HREF="lynx-dev.html">link</A>.  There also are links to <A
 HREF="http://www.flora.org/lynx-dev/html/">archives</A> in html
 format for this mailing list.
 
diff --git a/about_lynx/lynx-dev.html b/about_lynx/lynx-dev.html
new file mode 100644
index 00000000..f062f674
--- /dev/null
+++ b/about_lynx/lynx-dev.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html public "-//IETF//DTD HTML 3.0//EN">
+<html>
+<head>
+<title>Lynx-Dev Discussion List</title>
+<link rev="made" href="mailto:lynx-dev@sig.net">
+</head>
+
+<body>
+<banner>
+[ <a href="http://www.flora.org/lynx-dev/html/">Lynx-Dev Archives</a> |
+<a href="about_lynx.html">About Lynx</a> ]
+</banner>
+
+<h1><em>Lynx-Dev Discussion List</em></h1>
+
+Lynx-dev is a majordomo mailing list used by developers and interested
+users as a forum to discuss the further development of the Lynx World
+Wide Web browser.  Topic issues include fixing known bugs, porting Lynx
+to various systems, and increasing the usability of Lynx.
+
+<h2><em>Subscribing to Lynx-Dev</em></h2>
+
+If you are interested in <em>joining</em> this mailing list,
+send email to <a href="mailto:majordomo@sig.net"
+>majordomo@sig.net</a> with only the following request
+in the body of your message: <em>SUBSCRIBE LYNX-DEV address</em><br>
+where inclusion of your email address is optional if it can be obtained,
+correctly, from the mail headers of your subscription request.
+
+<p><em>NOTE:</em> Subject headers are ignored by the majordomo.
+
+<h2><em>Unsubscribing from Lynx-Dev</em></h2>
+
+To <em>unsubscribe</em>, send an email message to
+<a href="mailto:majordomo@sig.net"
+>majordomo@sig.net</a> with only the following request
+in the body: <em>UNSUBSCRIBE LYNX-DEV address</em><br>
+where inclusion of your email address is optional if it can be obtained,
+correctly, from the mail headers of your request.
+
+<h2><em>Majordomo Commands</em></h2>
+
+To receive a brief description of majordomo <em>commands</em>, place
+the following request in a message to <a href="mailto:majordomo@sig.net"
+>majordomo@sig.net</a>: <em>HELP</em>
+
+<h2><em>Contacting Lynx-Dev</em></h2>
+
+If you have questions, problems, or comments about using Lynx or
+installing it on your system, send email to 
+<a href="mailto:lynx-dev@sig.net"
+>lynx-dev@sig.net</a> (<em>after you've subscribed</em>).
+
+<p>If you have problems with majordomo not responding to your requests,
+send email to the <em>list owner</em>: <a
+href="mailto:majordomo-owner@sig.net"
+>majordomo-owner@sig.net</a>. Please,
+<em>DO NOT</em> send them to <em>lynx-dev@sig.net</em> as they
+will be distributed to everyone on the list and will clutter
+up their mailboxes.
+
+<h2><em>Lynx-Dev Archives</em></h2>
+
+Archives of messages posted to lynx-dev are now in html format so that
+you can view them using Lynx.
+
+<p>Go to the <a href="http://www.flora.org/lynx-dev/html/"
+>Lynx-Dev Archives</a>.
+</body>
+</html>
diff --git a/lynx_help/lynx_help_main.html b/lynx_help/lynx_help_main.html
index 762d058d..b6bd6b21 100644
--- a/lynx_help/lynx_help_main.html
+++ b/lynx_help/lynx_help_main.html
@@ -25,7 +25,7 @@
 | <a href="http://www.slcc.edu/lynx/faq.html"
 >Lynx FAQ</a>
 <li><a href="../about_lynx/about_lynx.html">About Lynx</a>
-| <a href="../about_lynx/about_lynx-dev.html">About Lynx-Dev</a>
+| <a href="../about_lynx/lynx-dev.html">About Lynx-Dev</a>
 | <a href="http://www.access.digex.net/~asgilman/lynx/FAQ/"
 >Al's Picks (FAQ)</a>
 </ul>
diff --git a/src/GridText.c b/src/GridText.c
index e057c95f..0f764f49 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -199,8 +199,8 @@ struct _HText {
 	char			kanji_buf;		/* Lead multibyte */
 	int			in_sjis;		/* SJIS flag */
 
-#ifdef EXP_CHARTRANS
 	BOOL			have_8bit_chars;   /* Any non-ASCII chars? */
+#ifdef EXP_CHARTRANS
 	LYUCcharset *		UCI;		   /* node_anchor UCInfo */
 	int			UCLYhndl;	   /* charset we are fed */
 	UCTransParams		T;
diff --git a/src/LYCurses.c b/src/LYCurses.c
index bad0ceb6..805127cc 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -407,9 +407,11 @@ PRIVATE void LYsetWAttr ARGS1(WINDOW *, win)
 #endif /* DOSPATH */
 	}
 
+#ifndef __DJGPP__
 	if (no_color_video < 0) {
 		no_color_video = tigetnum("ncv");
 	}
+#endif /* __DJGPP__ */
 
 	if (Current_Attr & A_BOLD)
 		code |= 1;
diff --git a/src/LYDownload.c b/src/LYDownload.c
index 53758e9a..82002a9a 100644
--- a/src/LYDownload.c
+++ b/src/LYDownload.c
@@ -633,7 +633,9 @@ PUBLIC int LYdownload_options ARGS2(
 	HTAlert(CANNOT_OPEN_TEMP);
 	return(-1);
     }
+#ifndef DOSPATH
     chmod(tempfile, 0600);
+#endif /* DOSPATH */
 
     LYstrncpy(LYValidDownloadFile,
 	      data_file,
diff --git a/src/LYExtern.c b/src/LYExtern.c
index cbe7ac3d..69607d02 100644
--- a/src/LYExtern.c
+++ b/src/LYExtern.c
@@ -73,7 +73,16 @@ void run_external(char * c)
 
 		 stop_curses();
 		 fflush(stdout);
+#ifdef __DJGPP__
+              __djgpp_set_ctrl_c(0);
+              _go32_want_ctrl_break(1);
+#endif /* __DJGPP__ */
 		 system(command);
+#ifdef __DJGPP__
+              __djgpp_set_ctrl_c(1);
+              _go32_want_ctrl_break(0);
+#endif /* __DJGPP__ */
+
 		 fflush(stdout);
 		 start_curses();
 		}
diff --git a/src/LYMain.c b/src/LYMain.c
index ff473d5d..89db134d 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -532,6 +532,7 @@ PUBLIC int main ARGS2(
 
 #ifdef DJGPP
     sock_init();
+    _fmode = O_BINARY;
 #endif
 
 #ifdef DOSPATH
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index cdaedb29..154930e6 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -4233,7 +4233,19 @@ check_add_bookmark_to_self:
 #ifdef DOSPATH	
 	system("cls");	
 	system("echo Type EXIT to return to Lynx.");
-	system(getenv("COMSPEC") == NULL ? "command.com" : getenv("COMSPEC"));
+#ifdef __DJGPP__
+      __djgpp_set_ctrl_c(0);
+      _go32_want_ctrl_break(1);
+#endif /* __DJGPP__ */
+      if (getenv("SHELL") != NULL) {
+           system(getenv("SHELL"));
+      } else {
+	   system(getenv("COMSPEC") == NULL ? "command.com" : getenv("COMSPEC"));
+      }
+#ifdef __DJGPP__
+      __djgpp_set_ctrl_c(1);
+      _go32_want_ctrl_break(0);
+#endif /* __DJGPP__ */
 #else
 #ifdef VMS
 		system("");
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 60f80410..25f4301e 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -303,7 +303,7 @@ static char *Color_Strings[16] =
 	 "gray",
 	 "brightblue",
 	 "brightgreen",
-	 "lightcyan",
+	 "brightcyan",
 	 "brightred",
 	 "brightmagenta",
 	 "yellow",
diff --git a/src/makefile.dos b/src/makefile.dos
index 367d2e62..bb9c7f09 100644
--- a/src/makefile.dos
+++ b/src/makefile.dos
@@ -5,13 +5,13 @@ LYOptions.o LYReadCFG.o LYSearch.o LYHistory.o \
 LYForms.o LYPrint.o LYrcFile.o LYDownload.o LYNews.o LYKeymap.o \
 HTFWriter.o HTInit.o DefaultStyle.o LYLocal.o LYUpload.o \
 LYLeaks.o LYexit.o LYJump.o LYList.o LYCgi.o LYTraversal.o \
-LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o HTML.o 
+LYEditmap.o LYCharSets.o LYCharUtils.o LYMap.o LYCookie.o LYExtern.o HTML.o 
 
 CFLAGS= $(MCFLAGS) -I.. $(SLANGINC)
 
 CC = gcc
 #MCFLAGS = -O -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implementation -I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp -I../djgpp/pdcurses/include
-MCFLAGS = -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implementation -I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp -I../djgpp/pdcurses/include
+MCFLAGS = -DCOLOR_CURSES -DNCURSES -DFANCY_CURSES -DACCESS_AUTH -DNO_CUSERID -DNOUSERS -DDOSPATH -DNO_TTYTYPE -DNO_UTMP -I../WWW/library/implementation -I../djgpp/tcplib/include -I../djgpp/tcplib/include/tcp -I../djgpp/pdcurses/include
 WWWLIB = ../WWW/library/djgpp/libwww.a ../djgpp/pdcurses/lib/libcurso.a ../djgpp/tcplib/obj/libtcp.a
 
 all: lynx
@@ -51,3 +51,5 @@ LYDownload.o: LYDownload.c ../userdefs.h
 DefaultStyle.o: DefaultStyle.c ../userdefs.h
 LYEditmap.o: LYEditmap.c ../userdefs.h
 LYCharUtils.o: LYCharUtils.c ../userdefs.h
+LYExtern.o: LYExtern.c ../userdefs.h
+
author	Thomas E. Dickey <dickey@invisible-island.net>	1997-08-07 14:35:47 -0400
committer	Thomas E. Dickey <dickey@invisible-island.net>	1997-08-07 14:35:47 -0400
commit	29e32111a2573cf7ecc9cd1d09dbf7dedd15dfcd (patch)
tree	eb21837aa9b85afaaf8381d71600e1e6dfe78cb3
parent	a93eca0b83e4d890c28d271eb3293f08666c613e (diff)
download	lynx-snapshots-29e32111a2573cf7ecc9cd1d09dbf7dedd15dfcd.tar.gz