[m-rev.] diff: check for lynx

[Peter Ross]

On Mon, Oct 27, 2003 at 12:07:08PM +1100, Fergus Henderson wrote:
> On 25-Oct-2003, Peter Ross <pro at missioncriticalit.com> wrote:
> > 
> > Not everybody has lynx installed on their systems, so test for it.
> ...
> > +++ Mmakefile	25 Oct 2003 15:03:17 -0000
> > @@ -264,7 +264,11 @@
> >  INSTALL: .INSTALL.in VERSION
> >  	sed 's/@VERSION@/$(VERSION)/g' .INSTALL.in > INSTALL
> >  
> > +ifeq ("$(LYNX)","")
> > +TEXT_TO_HTML = cat
> > +else
> >  TEXT_TO_HTML = TERM=vt100 lynx -dump
> > +endif
> 
> This is a problem with the existing code, rather than anything you've
> changed... but that variable should be named "HTML_TO_TEXT", not
> "TEXT_TO_HTML".
> 
> > Index: configure.in
> ...
> > @@ -443,6 +443,9 @@
> >  esac
> >  AC_SUBST(TEXI2DVI)
> >  #-----------------------------------------------------------------------------#
> > +AC_PATH_PROG(LYNX,lynx)
> > +AC_SUBST(lynx)
> 
> That should be
> 
> 	AC_SUBST(LYNX)
> 
> (note capitals).
> 


===================================================================


Estimated hours taken: 0.1
Branches: main

Some fixes suggested by fjh review comments.

Mmakefile:
	s/TEXT_TO_HTML/HTML_TO_TEXT/g

configure.in:
	s/AC_SUBST(lynx)/AC_SUBST(LYNX)/


Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.102
diff -u -r1.102 Mmakefile
--- Mmakefile	27 Oct 2003 06:00:27 -0000	1.102
+++ Mmakefile	27 Oct 2003 09:28:21 -0000
@@ -282,16 +282,16 @@
 	sed 's/@VERSION@/$(VERSION)/g' .INSTALL.in > INSTALL
 
 ifeq ("$(LYNX)","")
-TEXT_TO_HTML = cat
+HTML_TO_TEXT = cat
 else
-TEXT_TO_HTML = TERM=vt100 lynx -dump
+HTML_TO_TEXT = TERM=vt100 lynx -dump
 endif
 
 WORK_IN_PROGRESS: compiler/notes/work_in_progress.html
-	$(TEXT_TO_HTML) compiler/notes/work_in_progress.html > WORK_IN_PROGRESS
+	$(HTML_TO_TEXT) compiler/notes/work_in_progress.html > WORK_IN_PROGRESS
 
 TODO: compiler/notes/todo.html
-	$(TEXT_TO_HTML) compiler/notes/todo.html > TODO
+	$(HTML_TO_TEXT) compiler/notes/todo.html > TODO
 
 mercury-compiler.spec: .mercury-compiler.spec.in VERSION
 	version_with_underscores=`echo $(VERSION) | sed 's/-/_/g'`; \
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.377
diff -u -r1.377 configure.in
--- configure.in	25 Oct 2003 15:06:17 -0000	1.377
+++ configure.in	27 Oct 2003 09:28:21 -0000
@@ -444,7 +444,7 @@
 AC_SUBST(TEXI2DVI)
 #-----------------------------------------------------------------------------#
 AC_PATH_PROG(LYNX,lynx)
-AC_SUBST(lynx)
+AC_SUBST(LYNX)
 #-----------------------------------------------------------------------------#
 AC_PATH_PROG(DVIPS,dvips)
 AC_SUBST(DVIPS)

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------