Compile error - weird

[BLKMGK]

I'm getting a strange compile error

Detected 2 procs/cores, using -j2
make: Entering directory `/home/blkmgk/XBMC'
Makefile:95: *** missing separator. Stop.
make: Leaving directory `/home/blkmgk/XBMC'


Looking in Makefile I see something odd at like 95. The error during compile occurs just after the various makefiles are created.

<<<<<<< .mine
=======
CLEAN_FILES=xbmc.bin xbmc-xrandr

>>>>>>> .r15912


When I edit the Makefile to remove those lines and rerun the build script the lines reappear. I looked at patch 15912 since this seemed to point to that and it didn't look like anything there was of use. I tried reverting to a version prior to 15912 and no joy.

I am currently on rev 15924, Ubuntu 8.10. Pastebin of the compile log is here (http://pastebin.com/m4757815f) but it's not complete from the very beginning as my scrollback buffer doesn't go quite that far back. Since no one else has reported this I don't think it's common but I'm puzzled as to hwo best to fix it. Obviously the creation of the Makefile is getting dorked but I'm not sure how :eek:

[malloc]

My guess is you made some changes to the Makefile and then did svn up and there were conflicts. You need to resolve the conflicts.

[althekiller]

The changes are in Makefile.in. Makefile isn't versioned so svn wouldn't muck with it, this also explains the lines "reappearing" since Makefile is generated from Makefile.in on configure.

[malloc]

tomato, tomato...i guess that doesn't work on the Internet. Point is, don't muck with the build files and expect not to break things.

[BLKMGK]

Umm, didn't muck with the makefiles. All I've done recently is erase all but my userdata directory and SVN update to an OLD version and then step forward until I realized my TV was an issue. At that point I did a full SVN up to current and it's had issues ever since. I do see the offending lines in Makefile.in. I will try renaming it and updating, if that doesn't fix this I will remove the lines myself. No clue how they got there - I did not muck with any of these files by hand <shrug>

Brought down new version from SVN - appears clean! Thanks!!

Edit: ROTFL, died on a different error in DVDplayer, oh well! hehe