2007-07-30  Juan Manuel Guerrero  <juan.guerrero@gmx.de>

	* Makefile.am: Add doc/Makefile.am.

	* configure.ac: Add doc/Makefile.am.

	* doc/Makefile.am: New file.

	* doc/marst.texi: DJGPP specific adjustment.

	* macvt.c: DJGPP specific adjustment.

	* marst.c: DJGPP specific adjustment.




diff -aprNU5 marst-2.5.orig/Makefile.am marst-2.5/Makefile.am
--- marst-2.5.orig/Makefile.am	2007-06-30 08:00:00 +0000
+++ marst-2.5/Makefile.am	2007-07-30 17:43:22 +0000
@@ -1,8 +1,10 @@
 # Process this file with automake to produce Makefile.in
 
-bin_PROGRAMS = marst macvt
+SUBDIRS = doc
+
+bin_PROGRAMS = marst$(EXEEXT) macvt$(EXEEXT)
 
 marst_SOURCES = marst.c
 
 macvt_SOURCES = macvt.c
 
@@ -18,12 +20,12 @@ SUFFIXES = .alg
 libalgol_la_SOURCES = alglib1.c alglib2.c alglib3.c
 
 $(libalgol_la_SOURCES): marst$(EXEEXT)
 
 check: marst$(EXEEXT) macvt$(EXEEXT) libalgol.la
-	./macvt -i -s examples/euler.txt -o examples/euler.alg
-	./marst examples/euler.alg -o examples/euler.c
-	./marst examples/gps.alg -o examples/gps.c
-	$(CC) $(CFLAGS) -I. examples/gps.c -o examples/gps $(LDFLAGS) \
+	./macvt$(EXEEXT) -i -s examples/euler.txt -o examples/euler.alg
+	./marst$(EXEEXT) examples/euler.alg -o examples/euler.c
+	./marst$(EXEEXT) examples/gps.alg -o examples/gps.c
+	$(CC) $(CFLAGS) -I. examples/gps.c -o examples/gps$(EXEEXT) $(LDFLAGS) \
 		.libs/libalgol.a -lm
-	./examples/gps
+	./examples/gps$(EXEEXT)
 	@echo "If matrix C = A * B is unity, the check is OK"
diff -aprNU5 marst-2.5.orig/configure.ac marst-2.5/configure.ac
--- marst-2.5.orig/configure.ac	2007-06-30 08:00:00 +0000
+++ marst-2.5/configure.ac	2007-07-30 17:41:36 +0000
@@ -5,17 +5,18 @@ AC_CONFIG_SRCDIR([marst.c])
 AM_INIT_AUTOMAKE
 
 dnl Check for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
+AC_PROG_LIBTOOL
 
 dnl Check for libtool and disable unnecessary libtool tests.
 define([AC_LIBTOOL_LANG_CXX_CONFIG],[:])
 define([AC_LIBTOOL_LANG_F77_CONFIG],[:])
 define([AC_LIBTOOL_LANG_GCJ_CONFIG],[:])
 AC_PROG_LIBTOOL
 
 dnl Check for libraries.
 AC_CHECK_LIB([m],[sqrt])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile doc/makefile])
 AC_OUTPUT
diff -aprNU5 marst-2.5.orig/doc/Makefile.am marst-2.5/doc/Makefile.am
--- marst-2.5.orig/doc/Makefile.am	1970-01-01 00:00:00 +0000
+++ marst-2.5/doc/Makefile.am	2007-07-30 17:44:30 +0000
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in -*-Makefile-*-
+## Copyright (C) 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+## 02110-1301  USA
+
+AM_MAKEINFOFLAGS = --no-split
+info_TEXINFOS = marst.texi
diff -aprNU5 marst-2.5.orig/doc/marst.texi marst-2.5/doc/marst.texi
--- marst-2.5.orig/doc/marst.texi	2007-06-30 08:00:00 +0000
+++ marst-2.5/doc/marst.texi	2007-07-30 17:40:52 +0000
@@ -21,10 +21,11 @@ a permission notice identical to this on
 
 Permission is granted to copy and distribute translations of this manual
 into another language, under the above conditions for modified versions.
 @end copying
 
+@dircategory Programming
 @direntry
 * marst: (marst).               GNU Algol-to-C Translator
 @end direntry
 
 @titlepage
diff -aprNU5 marst-2.5.orig/macvt.c marst-2.5/macvt.c
--- marst-2.5.orig/macvt.c	2007-06-30 08:00:00 +0000
+++ marst-2.5/macvt.c	2007-07-30 17:40:52 +0000
@@ -26,11 +26,11 @@
 #include <stdlib.h>
 #include <string.h>
 
 /*--------------------------------------------------------------------*/
 
-static char *version = "MACVT -- Algol 60 Converter, Version 2.5";
+static char *version = "MACVT -- Algol 60 Converter, Version 2.5  (DJGPP port (r1))";
 /* Version information. */
 
 static char *infilename = "";
 /* The name of input text file that contains source Algol 60 program.
    If this file is the standard input file then its name is "(stdin)".
diff -aprNU5 marst-2.5.orig/marst.c marst-2.5/marst.c
--- marst-2.5.orig/marst.c	2007-06-30 08:00:00 +0000
+++ marst-2.5/marst.c	2007-07-30 17:40:52 +0000
@@ -78,11 +78,11 @@
 -- and which is used by these routines is not the original syntax of the
 -- reference language. But this syntax is equivalent to the original one
 -- in the sense that they both define the same language.
 ----------------------------------------------------------------------*/
 
-static char *version = "MARST -- Algol-to-C Translator, Version 2.5";
+static char *version = "MARST -- Algol-to-C Translator, Version 2.5  (DJGPP port (r1))";
 /* Version information. */
 
 static char *infilename = "";
 /* The name of input text file that contains source Algol 60 program.
    If this file is the standard input file then its name is "(stdin)".
