[m-dev.] diff: handle missing info in doc/Mmakefile

[Tyson Dowd]

Hi,

Another small makefile/configure change to build more cleanly
on Windows.  This probably took less time than installing info
but transferring the patch using cvspatch was another matter ;-)

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


Estimated hours taken: 1

Handle missing info better on Cygwin32.

Mmake.common.in:
configure.in:
	Look for info in the path.
	Previously we assumed that if you had makeinfo you had info,
	but this isn't true of a standard install of Cygwin.

doc/Mmakefile:
	Don't try to build mdb_doc if you don't have info.
	Instead output a nice warning message.


Index: Mmake.common.in
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmake.common.in,v
retrieving revision 1.41
diff -u -r1.41 Mmake.common.in
--- Mmake.common.in	1999/11/15 05:10:22	1.41
+++ Mmake.common.in	1999/11/17 07:26:26
@@ -156,6 +156,7 @@
 #-----------------------------------------------------------------------------#
 
 INSTALL_INFO=@INSTALL_INFO@
+INFO=@INFO@
 TEXI2DVI=@TEXI2DVI@
 DVIPS=@DVIPS@
 MAKEINFO=@MAKEINFO@
Index: configure.in
===================================================================
RCS file: /home/mercury1/repository/mercury/configure.in,v
retrieving revision 1.190
diff -u -r1.190 configure.in
--- configure.in	1999/11/16 07:51:07	1.190
+++ configure.in	1999/11/17 07:26:26
@@ -191,6 +191,9 @@
 AC_PATH_PROG(MAKEINFO,makeinfo)
 AC_SUBST(MAKEINFO)
 #-----------------------------------------------------------------------------#
+AC_PATH_PROG(INFO,info)
+AC_SUBST(INFO)
+#-----------------------------------------------------------------------------#
 AC_PATH_PROG(PERL,perl)
 AC_SUBST(PERL)
 #-----------------------------------------------------------------------------#
Index: doc/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/doc/Mmakefile,v
retrieving revision 1.20
diff -u -r1.20 Mmakefile
--- Mmakefile	1999/10/25 14:07:30	1.20
+++ Mmakefile	1999/11/17 07:26:27
@@ -33,16 +33,22 @@
 endif
 
 ifeq ("$(MAKEINFO)","")
-	INFO=
+	INFOPAGES=
 	INSTALL_INFO=
 	MDB_DOC=
 else
-	INFO=info
+	ifeq ("$(INFO)","")
+		MDB_DOC=warn_no_mdb_doc
+		INSTALL_MDB_DOC=
+	else
+		MDB_DOC=mdb_doc mdb_command_list mdb_command_test.inp
+		INSTALL_MDB_DOC=install_mdb_doc
+	endif
+	INFOPAGES=info
 	INSTALL_INFO=install_info
-	MDB_DOC=mdb_doc mdb_command_list mdb_command_test.inp
-	INSTALL_MDB_DOC=install_mdb_doc
 endif
 
+
 ifeq ("$(DVIPS)","")
 	PS=
 	INSTALL_PS=
@@ -81,7 +87,7 @@
 	# Currently `mmake all' does not build the PostScript or plain-text
 	# versions of the documentation.  But it might make sense to add them.
 .PHONY: all
-all: $(INFO) $(DVI) $(HTML) manpages $(MDB_DOC) 
+all: $(INFOPAGES) $(DVI) $(HTML) manpages $(MDB_DOC) 
 #all: ps text
 
 #-----------------------------------------------------------------------------#
@@ -127,6 +133,10 @@
 	$(MAKEINFO) $<
 
 #-----------------------------------------------------------------------------#
+
+warn_no_mdb_doc: 
+	# Warning: Unable to build mdb documentation.
+	# This is probably due to a missing `makeinfo' or `info'
 
 mdb_doc: generate_mdb_doc mercury_user_guide.info mdb_categories
 	./generate_mdb_doc


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't eveyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------