This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: Fastjar's Makefile:153: *** missing separator. Stop.
- To: Christian Jönsson <c dot christian dot joensson at telia dot com>
- Subject: Re: Fastjar's Makefile:153: *** missing separator. Stop.
- From: Gerald Pfeifer <pfeifer at dbai dot tuwien dot ac dot at>
- Date: Sun, 17 Dec 2000 19:53:29 +0100 (CET)
- cc: <gcc at gcc dot gnu dot org>
On Sun, 17 Dec 2000, Christian Jönsson wrote:
> Now, the Makefile looks pretty odd, starting at line 153, it's this:
>
> <<<<<<< Makefile.in
> TAR = gtar
> =======
> TAR = tar
> >>>>>>> 1.4
This is a CVS conflict; just remove that file and do another CVS update.
The CVS manual has more detailed information about conflicts, if you
are interested.
Hope this helps,
Gerald
--
Gerald "Jerry" pfeifer@dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/