Re: LYNX-DEV Re: reorganizing the lynx-archive

[Paul Gilmartin]

In a recent note, Nelson Henry Eric said:

> Date: Mon, 11 Nov 1996 10:06:48 +0900 (JST)
> 
> I suggested an addition to the top level Makefile along the lines of
> the following, but I do not have enough computer knowledge to offer
> a diff -c.  If anyone wants to correct it and make it workable for all
> systems supported, I think it would urge more people to make use of the
> resources they have available locally.  There also needs to be a blurb
> in INSTALLATION advertising the use of this target, and the need to set
> #define HELPFILE " in either userdefs.h or lynx.cfg.
> 
> full-install:
>         install -c -m 555 lynx $(exec)/lynx
>         install -c -m 444 lynx.man /usr/local/man/man1/lynx.1
>         mv about_lynx/* lynx_help/
>         tar cf - lynx_help >> $(exec)/lynx_help.tar
>         cp CHANGES $(exec)/changes.txt
>         rm -r $(exec)/lynx_help
>         cd $(exec); tar xf lynx_help.tar
>         rm $(exec)/*.tar
> 
Here are a number of changes I've been using to do this.

o Install help files, tests, and samples to a target directory.
  Tars via a pipe with no work files.

o Edit lynx.cfg on install to point to the startfile and help file

o Pass STARTFILE as a preprocessor definition to eliminate need
  to edit userdefs.h

o (kind of incidentally) Generate context diff with make target.

Needs:

o Definition of STARTFILE -- too entwined in local mods to
   submit here

o Testing on systems that I don't know.

-- gil
=======================================================================
diff -rc ./orig/lynx2-6/Makefile ./lynx2-6/Makefile
*** ./orig/lynx2-6/Makefile     Sun Sep  1 13:25:49 1996
--- ./lynx2-6/Makefile  Sun Sep  1 13:43:18 1996
***************
*** 264,269 ****
--- 292,301 ----
  # Set SITE_DEFS to one or more of the defines for lynx below:
  SITE_DEFS = $(DIR_DEFS) # Your defines here (remove the "#")
  
+ ##pass this into userdefs.h to avoid need for synchronized changes.
+ SITE_DEFS = $(DIR_DEFS) -DLYNX_CFG_FILE=\\\"${cfg}/lynx.cfg\\\" \
+                         -DSTARTFILE=\\\"${STARTFILE}\\\"
+ 
  # if you are compiling on a previously unsupported system, modify
  # this generic entry!!
  #
***************
*** 944,952 ****
  compress: tar
        cd ..; rm -f $(lynxdir).tar.Z; compress -f -v $(lynxdir).tar
  
! install:
        -mv -f $(exec)/lynx $(exec)/lynx.old
-       -mv -f $(cfg)/lynx.cfg $(cfg)/lynx.oldcfg
        $(installbin) lynx $(exec)/lynx
        $(installdoc) lynx.man $(doc)/lynx.1
!       $(installdoc) lynx.cfg $(cfg)/lynx.cfg
--- 976,999 ----
  compress: tar
        cd ..; rm -f $(lynxdir).tar.Z; compress -f -v $(lynxdir).tar
  
! lynx.patch : ./orig/${lynxdir} ./${lynxdir}
!       diff -rc ./orig/${lynxdir} ./${lynxdir} \
!               | grep -v '^Common' \
!               | grep -v '^Binary files ' \
!               | grep -v '^Only ' | tee $@ | grep -e '^--- \.\/lynx'
! 
! install: installhelp installcfg
        -mv -f $(exec)/lynx $(exec)/lynx.old
        $(installbin) lynx $(exec)/lynx
        $(installdoc) lynx.man $(doc)/lynx.1
!       -/usr/etc/catman -w -M ${doc}/..
! 
! installcfg:
!       -mv -f $(cfg)/lynx.cfg $(cfg)/lynx.oldcfg
!       sed -e 's!CFG_LIB!${cfg}!' < lynx.cfg | \
!       sed -e 's!START_FILE!${STARTFILE}!' > $(cfg)/lynx.cfg
! 
! installhelp:
!       tar -cf - about_lynx lynx_help | ( cd ${cfg}; tar -xf - )
!       tar -cf - CHANGES PROBLEMS README samples test | \
!                              ( cd ${cfg}/lynx_help; tar -xf - )



diff -rc ./orig/lynx2-6/lynx.cfg ./lynx2-6/lynx.cfg
*** ./orig/lynx2-6/lynx.cfg     Fri Aug 30 19:26:06 1996
--- ./lynx2-6/lynx.cfg  Sun Sep  1 13:26:20 1996
***************
*** 22,28 ****
  #  replace PATH_TO with the complete path to FILENAME
  #  use Unix SHELL syntax and include the device on VMS systems)
  #
! STARTFILE:http://www.nyu.edu/pages/wsn/subir/lynx.html
  
  # HELPFILE must be defined as a URL and must have a
  # complete path if local:
--- 22,29 ----
  #  replace PATH_TO with the complete path to FILENAME
  #  use Unix SHELL syntax and include the device on VMS systems)
  #
! # STARTFILE:http://www.nyu.edu/pages/wsn/subir/lynx.html
! STARTFILE:START_FILE
  
  # HELPFILE must be defined as a URL and must have a
  # complete path if local:
***************
*** 34,40 ****
  # http://www.nyu.edu/pages/wsn/subir/lynx.html
  #   This should be changed to the local path.
  #
! HELPFILE:http://www.nyu.edu/pages/wsn/subir/lynx.html
  #HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
  
  # DEFAULT_INDEX_FILE is the default file retrieved when the
--- 35,42 ----
  # http://www.nyu.edu/pages/wsn/subir/lynx.html
  #   This should be changed to the local path.
  #
! # HELPFILE:http://www.nyu.edu/pages/wsn/subir/lynx.html
! HELPFILE:file://localhostCFG_LIB/lynx_help/lynx_help_main.html
  #HELPFILE:file://localhost/PATH_TO/lynx_help/lynx_help_main.html
  
  # DEFAULT_INDEX_FILE is the default file retrieved when the



diff -rc ./orig/lynx2-6/userdefs.h ./lynx2-6/userdefs.h
*** ./orig/lynx2-6/userdefs.h   Thu Aug 29 15:54:02 1996
--- ./lynx2-6/userdefs.h        Sun Sep  1 13:26:21 1996
***************
*** 351,357 ****
--- 351,359 ----
   * note: STARTFILE must be a URL.  See the Lynx online help for more
   *       information on URLs
   */
+ #ifndef STARTFILE
  #define STARTFILE "http://www.nyu.edu/pages/wsn/subir/lynx.html";
+ #endif /* STARTFILE */
  
  /*****************************
   * HELPFILE must be defined as a URL and must have a 
;
; To UNSUBSCRIBE:  Send a mail message to address@hidden
;                  with "unsubscribe lynx-dev" (without the
;                  quotation marks) on a line by itself.
;