Re: new build trouble

[Jason Stover]

On Wed, May 03, 2006 at 09:26:46AM +0800, John Darrington wrote:
> On Tue, May 02, 2006 at 09:19:10PM -0400, Jason Stover wrote:
>      On OpenBSD, with GNU make, clean build:
>      
>       math:~/src/pspp:21:17:39:0> gmake
>      Makefile:3719: *** commands commence before first target.  Stop.
> 
> ... and what's in the vicinity of line 3719 ?
> 
> (You may have to do make -f Smake again)

That was my first thought, but I did that: 

> make -f Smake clean
> make -f Smake 
> ./configure --prefix=$HOME --enable-debugging --without-gui

which creates Makefile.

Here is what goes into the Makefile around line 3719 ('sorry for not
putting that in before):

src/procedure.o: AM_CPPFLAGS += \
 -I$(top_srcdir)/src/language \
 -I$(top_srcdir)/src/language/control \
 -I$(top_srcdir)/src/output \
 -I$(top_srcdir)/src/data \
 -I$(top_srcdir)/src/libpspp
        tests/command/regression.sh \
=======
        tests/command/print-strings.sh \
>>>>>>> 1.4
        tests/command/rename.sh \
        tests/command/regression.sh \
        tests/command/sample.sh \

It looks like CVS tried to merge something, but I don't know what. The
same pattern is in Makefile.in, but not Makefile.am, and grep '==='
everywhere doesn't show anything unusual.

-Jason