* Makefile.cfg (local-checks-to-skip): Add changelog-check,

since we don't want to insist on a version number at the start
of the changelog every time.
* Makefile.maint: Sync from coreutils a bit better.
(sc_trailing_blank): Renamed from sc_trailing_space.
All uses changed.
(sc_no_if_have_config_h, sc_require_config_h):
(sc_prohibit_assert_without_use): New rules.
(sc_obsolete_symbols): Don't catch Makefile.maint itself.
(sc_dd_max_sym_length): Fix leading spaces in rule.
(sc_system_h_headers): Prefix with @.
(sc_useless_cpp_parens, m4-check): Output line numbers.
(changelog-check): Allow version only in head.
* data/c.m4: Use "defined FOO" instead of "defined (FOO)", to
satisfy new Makefile.maint rule.
* data/glr.c: Likewise.
* data/glr.cc: Likewise.
* data/lalr1.cc: Likewise.
* data/yacc.c: Likewise.
* lib/ebitsetv.c: Likewise.
* lib/lbitset.c: Likewise.
* lib/subpipe.c: Likewise.
* lib/timevar.c: Likewise.
* src/system.h: Likewise.
* data/yacc.c (YYSTYPE): Don't generate trailing spaces in output.
* djgpp/Makefile.maint: Add copyright notice.
* djgpp/README.in: Likewise.
* djgpp/config.bat: Likewise.
* djgpp/config.site: Likewise.
* djgpp/config_h.sed: Likewise.
* djgpp/djunpack.bat: Likewise.
* djgpp/config.sed: Fix copyright notice to match standard format.
* djgpp/subpipe.h: Likewise.
* lib/bitsetv-print.c: Likewise.
* lib/bitsetv.c: Likewise.
* lib/subpipe.h: Likewise.
* lib/timevar.c: Likewise.
* lib/timevar.h: Likewise.
* djgpp/subpipe.c: Use standard recipe for config.h.
* lib/abitset.c: Likewise.
* lib/bitset.c: Likewise.
* lib/bitset_stats.c: Likewise.
* lib/bitsetv-print.c: Likewise.
* lib/bitsetv.c: Likewise.
* lib/ebitsetv.c: Likewise.
* lib/get-errno.c: Likewise.
* lib/lbitset.c: Likewise.
* lib/subpipe.c: Likewise.
* lib/timevar.c: Likewise.
* lib/vbitset.c: Likewise.
* tests/local.at: Likewise.
* src/scan-gram.l: Don't include verify.h, since system.h does
that for us.
* .x-sc_require_config_h: New file.
* .x-sc_unmarked_diagnostics: New file.

9 files changed, 284 insertions, 190 deletions

diff --git a/djgpp/Makefile.maint b/djgpp/Makefile.maint
index 03746746..2566d151 100644
--- a/djgpp/Makefile.maint
+++ b/djgpp/Makefile.maint
@@ -1,6 +1,22 @@
-# DJGPP Maintainer's Makefile                                         -*-Makefile-*-
+# DJGPP Maintainer's Makefile                                    -*-Makefile-*-
 # Requires GNU sed
 
+## Copyright (C) 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, 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.
+
 top_srcdir = ..
 srcdir = .
 
@@ -9,8 +25,8 @@ SHELL = /bin/sh
 all: README
 
 README: README.in $(top_srcdir)/configure
-	PACKAGE=`grep "^[ 	]*PACKAGE=" $(top_srcdir)/configure | sed -e 's/^[ 	]*PACKAGE=//' -e s/[\"\']//g`; \
-	VERSION=`grep "^[ 	]*VERSION=" $(top_srcdir)/configure | sed -e 's/^[ 	]*VERSION=//' -e s/[\"\']//g`; \
+	PACKAGE=`grep "^[	 ]*PACKAGE=" $(top_srcdir)/configure | sed -e 's/^[	 ]*PACKAGE=//' -e s/[\"\']//g`; \
+	VERSION=`grep "^[	 ]*VERSION=" $(top_srcdir)/configure | sed -e 's/^[	 ]*VERSION=//' -e s/[\"\']//g`; \
 	package_version=`echo "$${VERSION}" | sed 's/\.//g'`; \
 	tree_version=`echo "$${VERSION}" | sed 's/\.//2g'`; \
 	sed \
diff --git a/djgpp/README.in b/djgpp/README.in
index 188a8ccd..df657655 100644
--- a/djgpp/README.in
+++ b/djgpp/README.in
@@ -1,177 +1,193 @@
 This is a port of GNU Bison @VERSION@ to MSDOS/DJGPP.
 
+Copyright (C) 2005 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, 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.
+
 
 1.:     DJGPP specific changes.
-        =======================
-
-        The DJGPP port of Bison offers LFN and SFN support depending on which
-        OS it is running. If LFN support is available or not is determinated at
-        run time.  If LFN support is available (DOS session under Win9X), the
-        standard posix file name extensions will be used.  These are: y.tab.c,
-        y.tab.c++, y.tab.h, y.output, etc.  If only SFN support is available
-        (plain DOS), then the standard MSDOS short file names will be used.
-        These are: y_tab.c, y_tab.h, y.out, etc.
-        It should be noticed that this bison version needs the m4 program as
-        back end to generate the parser file (y.tab.c etc.) from the skeleton
-        files.  This implies that m4 must always be installed to get bison
-        working.  m4 will use a couple of m4 scripts that will be installed in
-        /dev/env/DJDIR/share/bison and shall not be removed.
-        It should also be noticed that the skeleton files bison.simple and
-        bison.hairy are no longer supported.  This applies also to the environ-
-        ment variables BISON_HAIRY and BISON_SIMPLE. Those variables are *no*
-        longer honored at all.
-        The kind of skeleton file bison.hairy is no longer supported at all.
-        The skeleton file bison.simple is now called yacc.c and is an m4 script.
-        The other two skeleton files supported by this bison version are glr.c
-        and lalr1.cc.  The first one is a generalized LR C parser based on
-        Bison's LALR(1) tables and the second one is a experimental C++ parser
-        class.
-        As has been told before, bison uses m4 to generate the parser file.
-        This is done by forking and using pipes for the IPC.  MSDOS does not
-        support this functionality so this has been reproduced in the usual
-        way by redirecting stdin and stdout of bison and m4 to temporary files
-        and processing these files in sequence.  All the changes to the sources
-        are documented in the djgpp/diffs file.
-
-        Please **read** the docs.
+	=======================
+
+	The DJGPP port of Bison offers LFN and SFN support depending on which
+	OS it is running. If LFN support is available or not is determinated at
+	run time.  If LFN support is available (DOS session under Win9X), the
+	standard posix file name extensions will be used.  These are: y.tab.c,
+	y.tab.c++, y.tab.h, y.output, etc.  If only SFN support is available
+	(plain DOS), then the standard MSDOS short file names will be used.
+	These are: y_tab.c, y_tab.h, y.out, etc.
+	It should be noticed that this bison version needs the m4 program as
+	back end to generate the parser file (y.tab.c etc.) from the skeleton
+	files.  This implies that m4 must always be installed to get bison
+	working.  m4 will use a couple of m4 scripts that will be installed in
+	/dev/env/DJDIR/share/bison and shall not be removed.
+	It should also be noticed that the skeleton files bison.simple and
+	bison.hairy are no longer supported.  This applies also to the environ-
+	ment variables BISON_HAIRY and BISON_SIMPLE. Those variables are *no*
+	longer honored at all.
+	The kind of skeleton file bison.hairy is no longer supported at all.
+	The skeleton file bison.simple is now called yacc.c and is an m4 script.
+	The other two skeleton files supported by this bison version are glr.c
+	and lalr1.cc.  The first one is a generalized LR C parser based on
+	Bison's LALR(1) tables and the second one is a experimental C++ parser
+	class.
+	As has been told before, bison uses m4 to generate the parser file.
+	This is done by forking and using pipes for the IPC.  MSDOS does not
+	support this functionality so this has been reproduced in the usual
+	way by redirecting stdin and stdout of bison and m4 to temporary files
+	and processing these files in sequence.  All the changes to the sources
+	are documented in the djgpp/diffs file.
+
+	Please **read** the docs.
 
 
 2.:     Installing the binary package.
-        ==============================
+	==============================
 
 2.1.:   Copy the binary distribution into the top DJGPP installation directory,
-        just unzip it preserving the directory structure running *ONE* of the
-        following commands:
-          unzip32 bsn@PACKAGE_VERSION@b.zip      or
-          djtarx bsn@PACKAGE_VERSION@b.zip       or
-          pkunzip -d bsn@PACKAGE_VERSION@b.zip
+	just unzip it preserving the directory structure running *ONE* of the
+	following commands:
+	  unzip32 bsn@PACKAGE_VERSION@b.zip      or
+	  djtarx bsn@PACKAGE_VERSION@b.zip       or
+	  pkunzip -d bsn@PACKAGE_VERSION@b.zip
 
 
 
 3.:     Building the binaries from sources.
-        ===================================
+	===================================
 
 3.1.:   Create a temporary directory and copy the source package into the
-        directory.  If you download the source distribution from one of the
-        DJGPP sites, just unzip it preserving the directory structure
-        running *ONE* of the following commands:
-          unzip32 bsn@PACKAGE_VERSION@s.zip      or
-          djtarx bsn@PACKAGE_VERSION@s.zip       or
-          pkunzip -d bsn@PACKAGE_VERSION@s.zip
-        and proceed to the paragraph 3.3, below.
+	directory.  If you download the source distribution from one of the
+	DJGPP sites, just unzip it preserving the directory structure
+	running *ONE* of the following commands:
+	  unzip32 bsn@PACKAGE_VERSION@s.zip      or
+	  djtarx bsn@PACKAGE_VERSION@s.zip       or
+	  pkunzip -d bsn@PACKAGE_VERSION@s.zip
+	and proceed to the paragraph 3.3, below.
 
 3.2.:   Source distributions downloaded from one of the GNU FTP sites need
-        some more work to unpack, if LFN support is not available.  If LFN is
-        available then you can extract the source files from the archive with
-        any unzip program and proceed to the paragraph 3.3, below.  Any file
-        name issue will be handled by the the DJGPP configuration files.
-        To unpack the source distribution on SFN systems, first, you MUST use
-        the `djunpack' batch file to unzip the package.  That is because some
-        file names in the official distributions need to be changed to avoid
-        problems on the various platforms supported by DJGPP.
-        `djunpack' invokes the `djtar' program (that is part of the basic DJGPP
-        development kit) to rename these files on the fly given a file with
-        name mappings; the distribution includes a file `djgpp/fnchange.lst'
-        with the necessary mappings.  So you need first to retrieve that batch
-        file, and then invoke it to unpack the distribution.  Here's how:
-
-          djtar -x -p -o bison-2.1/djgpp/djunpack.bat bison-2.1.tar.gz > djunpack.bat
-          djunpack bison-2.1.tar.gz
-
-        (The name of the distribution archive and the leading directory of the
-        path to `djunpack.bat' in the distribution will be different for
-        versions of Bison other than 2.1.)
-
-        If the argument to `djunpack.bat' include leading directories, it MUST
-        be given with the DOS-style backslashes; Unix-style forward slashes
-        will NOT work.
-
-        If the distribution comes as a .tar.bz2 archive, and your version of
-        `djtar' doesn't support bzip2 decompression, you need to unpack it as
-        follows:
-
-          bnzip2 bison-2.1.tar.bz2
-          djtar -x -p -o bison-2.1/djgpp/djunpack.bat bison-2.1.tar > djunpack.bat
-          djunpack bison-2.1.tar
+	some more work to unpack, if LFN support is not available.  If LFN is
+	available then you can extract the source files from the archive with
+	any unzip program and proceed to the paragraph 3.3, below.  Any file
+	name issue will be handled by the the DJGPP configuration files.
+	To unpack the source distribution on SFN systems, first, you MUST use
+	the `djunpack' batch file to unzip the package.  That is because some
+	file names in the official distributions need to be changed to avoid
+	problems on the various platforms supported by DJGPP.
+	`djunpack' invokes the `djtar' program (that is part of the basic DJGPP
+	development kit) to rename these files on the fly given a file with
+	name mappings; the distribution includes a file `djgpp/fnchange.lst'
+	with the necessary mappings.  So you need first to retrieve that batch
+	file, and then invoke it to unpack the distribution.  Here's how:
+
+	  djtar -x -p -o bison-2.1/djgpp/djunpack.bat bison-2.1.tar.gz > djunpack.bat
+	  djunpack bison-2.1.tar.gz
+
+	(The name of the distribution archive and the leading directory of the
+	path to `djunpack.bat' in the distribution will be different for
+	versions of Bison other than 2.1.)
+
+	If the argument to `djunpack.bat' include leading directories, it MUST
+	be given with the DOS-style backslashes; Unix-style forward slashes
+	will NOT work.
+
+	If the distribution comes as a .tar.bz2 archive, and your version of
+	`djtar' doesn't support bzip2 decompression, you need to unpack it as
+	follows:
+
+	  bnzip2 bison-2.1.tar.bz2
+	  djtar -x -p -o bison-2.1/djgpp/djunpack.bat bison-2.1.tar > djunpack.bat
+	  djunpack bison-2.1.tar
 
 3.3.:   To build the binaries you will need the following binary packages:
-          djdev203.zip (or a later but NOT a prior version)
-          bsh204b.zip  (or a later but NOT a prior version)
-          gcc400b.zip, gpp400b.zip, bnu215b.zip, mak3791b.zip,
-          fil40b.zip, shl20jb.zip, txt20b.zip,
-          txi48b.zip, grep24b.zip, sed414b.zip,
-          m4-144b.zip.
-
-        If you want to run the check you will need also:
-          dif281b.zip
-
-        All this packages can be found in the v2gnu directory of any
-        ftp.delorie.com mirror.
-        You will need bsh203b.zip or later and *NOT* a prior version or
-        the build will fail.  The same applies to djdev203.zip.  Please note
-        that Bison requires m4-144b.zip or later to work properly.  All the
-        other packages are the ones I have used to build the binaries
-        from this source.  Previuos versions of this packages may do the
-        job as well but I have not tested this.
+	  djdev203.zip (or a later but NOT a prior version)
+	  bsh204b.zip  (or a later but NOT a prior version)
+	  gcc400b.zip, gpp400b.zip, bnu215b.zip, mak3791b.zip,
+	  fil40b.zip, shl20jb.zip, txt20b.zip,
+	  txi48b.zip, grep24b.zip, sed414b.zip,
+	  m4-144b.zip.
+
+	If you want to run the check you will need also:
+	  dif281b.zip
+
+	All this packages can be found in the v2gnu directory of any
+	ftp.delorie.com mirror.
+	You will need bsh203b.zip or later and *NOT* a prior version or
+	the build will fail.  The same applies to djdev203.zip.  Please note
+	that Bison requires m4-144b.zip or later to work properly.  All the
+	other packages are the ones I have used to build the binaries
+	from this source.  Previuos versions of this packages may do the
+	job as well but I have not tested this.
 
 3.4.:   If for some reason you want to reconfigure the package cd into the top
-        srcdir (bison-@TREE_VERSION@) and run the following commands:
-          del djgpp\config.cache
-          make clean
-          djgpp\config
-
-        Please note that you *MUST* delete the config.cache file in the djgpp
-        subdir or you will not really reconfigure the sources because the
-        configuration informations will be read from the cache file instead
-        of being newly computed.
-        To build the programs in a directory other than where the sources are,
-        you must add the parameter that specifies the source directory,
-        e.g:
-          x:\src\gnu\bison-@TREE_VERSION@\djgpp\config x:/src/gnu/bison-@TREE_VERSION@
-
-        Lets assume you want to build the binaries in a directory placed on a
-        different drive (z:\build in this case) from where the sources are,
-        then you will run the following commands:
-          z:
-          md \build
-          cd \build
-          x:\src\gnu\bison-@TREE_VERSION@\djgpp\config x:/src/gnu/bison-@TREE_VERSION@
-
-        The order of the options and the srcdir option does not matter.  You
-        *MUST* use forward slashes to specify the source directory.
-
-        The batch file will set same environment variables, make MSDOS specific
-        modifications to the Makefile.in's and supply all other needed options
-        to the configure script.
+	srcdir (bison-@TREE_VERSION@) and run the following commands:
+	  del djgpp\config.cache
+	  make clean
+	  djgpp\config
+
+	Please note that you *MUST* delete the config.cache file in the djgpp
+	subdir or you will not really reconfigure the sources because the
+	configuration informations will be read from the cache file instead
+	of being newly computed.
+	To build the programs in a directory other than where the sources are,
+	you must add the parameter that specifies the source directory,
+	e.g:
+	  x:\src\gnu\bison-@TREE_VERSION@\djgpp\config x:/src/gnu/bison-@TREE_VERSION@
+
+	Lets assume you want to build the binaries in a directory placed on a
+	different drive (z:\build in this case) from where the sources are,
+	then you will run the following commands:
+	  z:
+	  md \build
+	  cd \build
+	  x:\src\gnu\bison-@TREE_VERSION@\djgpp\config x:/src/gnu/bison-@TREE_VERSION@
+
+	The order of the options and the srcdir option does not matter.  You
+	*MUST* use forward slashes to specify the source directory.
+
+	The batch file will set same environment variables, make MSDOS specific
+	modifications to the Makefile.in's and supply all other needed options
+	to the configure script.
 
 3.5.:   To compile the package run from the top srcdir the command:
-          make
+	  make
 
 3.6.:   Now you can run the tests if you like.  From the top srcdir run the
-        command:
-          make check
+	command:
+	  make check
 
-        No test should fail.
-        Please note that the testsuite only works with LFN available.  On plain
-        DOS, most of the tests will fail due to invalid DOS names.
+	No test should fail.
+	Please note that the testsuite only works with LFN available.  On plain
+	DOS, most of the tests will fail due to invalid DOS names.
 
 3.7.:   To install the binaries, header, library, catalogs, and info docs
-        run the following command from the top srcdir:
-          make install
+	run the following command from the top srcdir:
+	  make install
 
-        This will install the products into your DJGPP installation tree given
-        by the default prefix "/dev/env/DJDIR".  If you prefer to install them
-        into some other directory you will have to set prefix to the appropiate
-        value:
-          make install prefix=z:/some/other/place
+	This will install the products into your DJGPP installation tree given
+	by the default prefix "/dev/env/DJDIR".  If you prefer to install them
+	into some other directory you will have to set prefix to the appropiate
+	value:
+	  make install prefix=z:/some/other/place
 
 
 
-        Send GNU bison specific bug reports to <bug-bison@gnu.org>.
-        Send suggestions and bug reports concerning the DJGPP port to
-        comp.os.msdos.djgpp or <djgpp@delorie.com>.
+	Send GNU bison specific bug reports to <bug-bison@gnu.org>.
+	Send suggestions and bug reports concerning the DJGPP port to
+	comp.os.msdos.djgpp or <djgpp@delorie.com>.
 
 
 Enjoy.
 
-        Guerrero, Juan Manuel <juan.guerrero@gmx.de>
+	Guerrero, Juan Manuel <juan.guerrero@gmx.de>
diff --git a/djgpp/config.bat b/djgpp/config.bat
index abcdaee6..820b5225 100644
--- a/djgpp/config.bat
+++ b/djgpp/config.bat
@@ -1,8 +1,26 @@
 @echo off

+Rem Configure Bison for DJGPP.

+

 Rem WARNING WARNING WARNING: This file needs to have DOS CRLF end-of-line

 Rem format, or else stock DOS/Windows shells will refuse to run it.

 

-echo Configuring GNU Bison for DJGPP v2.x...

+Rem Copyright (C) 2005, 2006 Free Software Foundation, Inc.

+

+Rem This program is free software; you can redistribute it and/or modify

+Rem it under the terms of the GNU General Public License as published by

+Rem the Free Software Foundation; either version 2, or (at your option)

+Rem any later version.

+

+Rem This program is distributed in the hope that it will be useful,

+Rem but WITHOUT ANY WARRANTY; without even the implied warranty of

+Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+Rem GNU General Public License for more details.

+

+Rem You should have received a copy of the GNU General Public License

+Rem along with this program; if not, write to the Free Software Foundation,

+Rem Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+

+echo Configuring Bison for DJGPP v2.x...

 

 Rem The SmallEnv tests protect against fixed and too small size

 Rem of the environment in stock DOS shell.

@@ -248,28 +266,28 @@ test -f %XSRC%/examples/calcxx/calcxx.cc
 if errorlevel 1 mv -f %XSRC%/examples/calcxx/calcpp.cc %XSRC%/examples/calcxx/calcxx.cc

 

 Rem Fixing #include lines in calcxx files.

-sed "/#[ 	]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx.cc > calcxx.cc

+sed "/#[	 ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx.cc > calcxx.cc

 if errorlevel 1 goto calcxxFileError

 mv ./calcxx.cc %XSRC%/examples/calcxx/calcxx.cc

-sed "/#[ 	]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-driver.cc > calcxx-driver.cc

+sed "/#[	 ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-driver.cc > calcxx-driver.cc

 if errorlevel 1 goto calcxxFileError

 mv ./calcxx-driver.cc %XSRC%/examples/calcxx/calcxx-driver.cc

-sed "/#[ 	]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-driver.hh > calcxx-driver.hh

+sed "/#[	 ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-driver.hh > calcxx-driver.hh

 if errorlevel 1 goto calcxxFileError

 mv ./calcxx-driver.hh %XSRC%/examples/calcxx/calcxx-driver.hh

-sed "/#[ 	]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.cc > calcxx-parser.cc

+sed "/#[	 ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.cc > calcxx-parser.cc

 if errorlevel 1 goto calcxxFileError

 mv ./calcxx-parser.cc %XSRC%/examples/calcxx/calcxx-parser.cc

-sed "/#[ 	]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.hh > calcxx-parser.hh

+sed "/#[	 ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.hh > calcxx-parser.hh

 if errorlevel 1 goto calcxxFileError

 mv ./calcxx-parser.hh %XSRC%/examples/calcxx/calcxx-parser.hh

-:sed "/#[ 	]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.yy > calcxx-parser.yy

+:sed "/#[	 ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-parser.yy > calcxx-parser.yy

 :if errorlevel 1 goto calcxxFileError

 :mv ./calcxx-parser.yy %XSRC%/examples/calcxx/calcxx-parser.yy

-sed "/#[ 	]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-scanner.cc > calcxx-scanner.cc

+sed "/#[	 ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-scanner.cc > calcxx-scanner.cc

 if errorlevel 1 goto calcxxFileError

 mv ./calcxx-scanner.cc %XSRC%/examples/calcxx/calcxx-scanner.cc

-:sed "/#[ 	]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-scanner.ll > calcxx-scanner.ll

+:sed "/#[	 ]*include/s/++/xx/" %XSRC%/examples/calcxx/calcxx-scanner.ll > calcxx-scanner.ll

 :if errorlevel 1 goto calcxxFileError

 :mv ./calcxx-scanner.ll %XSRC%/examples/calcxx/calcxx-scanner.ll

 sed "s/calc++/calcxx/" %XSRC%/examples/calcxx/test > test

diff --git a/djgpp/config.sed b/djgpp/config.sed
index 02424fad..55f08b7d 100644
--- a/djgpp/config.sed
+++ b/djgpp/config.sed
@@ -13,12 +13,11 @@
 # 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
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 # Additional editing of Makefiles
-/(echo[ 	]*':t/ a\
+/(echo[	 ]*':t/ a\
 # DJGPP specific Makefile changes.\
   /^aliaspath *	*=/s,:,";",g;t t\
   /TEXINPUTS=/s,:,";",g;t t\
@@ -70,7 +69,7 @@ yacc.bat:\\\
 # a Windows box, where leading dots in file names are allowed).
 s,\.deps,_deps,g
 s,\.libs,_libs,g
-/^rmdir[ 	]*\.tst/ i\
+/^rmdir[	 ]*\.tst/ i\
 am__leading_dot=_
 
 # Replace (command) > /dev/null with `command > /dev/null`, since
@@ -79,10 +78,10 @@ am__leading_dot=_
 /if ([^|;`]*null/{
   s,(,`,
   s,),,
-  /null[ 	]*2>&1/ s,2>&1,&`,
+  /null[	 ]*2>&1/ s,2>&1,&`,
   /null.*null/ s,null.*null,&`,
   /null.*null/ !{
-    /null[ 	]*2>&1/ !s,null,&`,
+    /null[	 ]*2>&1/ !s,null,&`,
   }
 }
 
@@ -105,7 +104,7 @@ am__leading_dot=_
 # and compiling across partitions.
 # 1) The given srcdir value is always translated from the
 #    "x:" syntax into "/dev/x" syntax while we run configure.
-/^[ 	]*-srcdir=\*.*$/ a\
+/^[	 ]*-srcdir=\*.*$/ a\
     ac_optarg=`echo "$ac_optarg" | sed "s,^\\([A-Za-z]\\):,/dev/\\1,"`
 /set X `ls -Lt \$srcdir/ i\
    if `echo $srcdir | grep "^/dev/" - > /dev/null`; then\
@@ -128,19 +127,19 @@ install_sh=`echo "$install_sh" | sed 's%/dev.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*%$
 #   ${top_srcdir}/tests/testsuite.dir
 # holds. The explicit names are of no importance.
 #   ../../. == ${top_srcdir}
-/\.)[ 	]*ac_abs_builddir=/,/^esac$/ {
+/\.)[	 ]*ac_abs_builddir=/,/^esac$/ {
  /^esac$/ a\
 ac_abs_builddir=`echo "$ac_abs_builddir" | sed "s%/dev.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../.%;s%.:.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../.%"`
 }
-/\.)[ 	]*ac_abs_top_builddir=/,/^esac$/ {
+/\.)[	 ]*ac_abs_top_builddir=/,/^esac$/ {
  /^esac$/ a\
 ac_abs_top_builddir=`echo "$ac_abs_top_builddir" | sed "s%/dev.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../../%;s%.:.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../../%"`
 }
-/\.)[ 	]*ac_abs_srcdir=/,/^esac$/ {
+/\.)[	 ]*ac_abs_srcdir=/,/^esac$/ {
  /^esac$/ a\
 ac_abs_srcdir=`echo "$ac_abs_srcdir" | sed "s%/dev.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../.%;s%.:.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../.%"`
 }
-/\.)[ 	]*ac_abs_top_srcdir=/,/^esac$/ {
+/\.)[	 ]*ac_abs_top_srcdir=/,/^esac$/ {
  /^esac$/ a\
 ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../../%;s%.:.*/bison-[0-9]\\{1,1\\}[-.0-9A-z]*/[^/]*%../../../%"`
 }
@@ -149,7 +148,7 @@ ac_abs_top_srcdir=`echo "$ac_abs_top_srcdir" | sed "s%/dev.*/bison-[0-9]\\{1,1\\
 /^#define VERSION/ s/\$VERSION/&  (DJGPP port (r1))/
 
 # We need makeinfo to make the html formated docs.
-/\$am_missing_run[ 	]*makeinfo/ s,\$am_missing_run,,
+/\$am_missing_run[	 ]*makeinfo/ s,\$am_missing_run,,
 
 # The path to the FORTRAN compiler and libraries
 # shall contain no absolute path reference so it
diff --git a/djgpp/config.site b/djgpp/config.site
index ebbd2bb8..23108860 100644
--- a/djgpp/config.site
+++ b/djgpp/config.site
@@ -3,6 +3,23 @@
 # This is the config.site file for configuring GNU packages
 # which are to be built with DJGPP tools.
 
+# Copyright (C) 2005 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, 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.
+
+
 # Include the djgpp subdirectory in PATH, so that getconf is found
 PATH="$srcdir/djgpp;$PATH"
 
diff --git a/djgpp/config_h.sed b/djgpp/config_h.sed
index 89184925..a8ea467d 100644
--- a/djgpp/config_h.sed
+++ b/djgpp/config_h.sed
@@ -1,15 +1,29 @@
 # sed script for DJGPP specific editing of config.hin
 
+# Copyright (C) 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, 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.
+
+
 $ a\
 \
 \
-/*  DJGPP specific defines.  */\
+/* DJGPP specific defines.  */\
 \
 #include <unistd.h>\
 #define TAB_EXT     ((pathconf(NULL, _PC_NAME_MAX) > 12) ? ".tab" : "_tab")\
 #define OUTPUT_EXT  ((pathconf(NULL, _PC_NAME_MAX) > 12) ? ".output" : ".out")\
 \
 #define DEFAULT_TMPDIR  "/dev/env/DJDIR/tmp"
-
-
-
diff --git a/djgpp/djunpack.bat b/djgpp/djunpack.bat
index f31094cf..bc02fc9e 100644
--- a/djgpp/djunpack.bat
+++ b/djgpp/djunpack.bat
@@ -7,6 +7,23 @@ Rem This batch file unpacks the Bison distribution while simultaneously
 Rem renaming some of the files whose names are invalid on DOS or conflict

 Rem with other file names after truncation to DOS 8+3 namespace.

 Rem

+Rem Copyright (C) 2005 Free Software Foundation, Inc.

+Rem

+Rem This program is free software; you can redistribute it and/or modify

+Rem it under the terms of the GNU General Public License as published by

+Rem the Free Software Foundation; either version 2, or (at your option)

+Rem any later version.

+Rem

+Rem This program is distributed in the hope that it will be useful,

+Rem but WITHOUT ANY WARRANTY; without even the implied warranty of

+Rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+Rem GNU General Public License for more details.

+Rem

+Rem You should have received a copy of the GNU General Public License

+Rem along with this program; if not, write to the Free Software Foundation,

+Rem Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

+Rem

+Rem

 Rem Invoke like this:

 Rem

 Rem     djunpack bison-XYZ.tar

diff --git a/djgpp/subpipe.c b/djgpp/subpipe.c
index 273e2195..33e2a382 100644
--- a/djgpp/subpipe.c
+++ b/djgpp/subpipe.c
@@ -1,6 +1,6 @@
 /* Subprocesses with pipes.
 
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -19,7 +19,7 @@
 /* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */
 
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
 
@@ -77,7 +77,7 @@ init_subpipe(void)
   if (fd < 0)
     error(EXIT_FAILURE, 0, _("creation of a temporary file failed"));
   close (fd);
-  
+
   strcpy(tmp_file_name[1], "/dev/env/TMPDIR/bnXXXXXX");
   fd = mkstemp(tmp_file_name[1]);
   if (fd < 0)
@@ -230,10 +230,10 @@ end_of_output_subpipe(pid_t pid, int fd[2])
     remove_tmp_file(STDIN_FILENO, tmp_file_name[0]);
     remove_tmp_file(STDOUT_FILENO, tmp_file_name[1]);
     error(EXIT_FAILURE, 0, _(errno == ENOENT
-                             ? "subsidiary program `%s' not found"
-                             : status < 1
-                             ? "subsidiary program `%s' failed"
-                             : "subsidiary program `%s' failed (status=%i, errno=%i)"), program, status, errno);
+			     ? "subsidiary program `%s' not found"
+			     : status < 1
+			     ? "subsidiary program `%s' failed"
+			     : "subsidiary program `%s' failed (status=%i, errno=%i)"), program, status, errno);
   }
 
 
diff --git a/djgpp/subpipe.h b/djgpp/subpipe.h
index adef87e2..db2eb8cf 100644
--- a/djgpp/subpipe.h
+++ b/djgpp/subpipe.h
@@ -1,22 +1,19 @@
 /* Subprocesses with pipes.
    Copyright (C) 2005 Free Software Foundation, Inc.
 
-   This file is part of Bison, the GNU Compiler Compiler.
+   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.
 
-   Bison 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, or (at your option)
-   any later version.
-
-   Bison 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.
+   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 Bison; see the file COPYING.  If not, write to the Free
-   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by Juan Manuel Guerrero <juan.guerrero@gmx.de>. */