[Ffmpeg-devel] Makefile consolidation

[Diego Biurrun]

On Sun, Feb 12, 2006 at 11:09:38PM +0000, M?ns Rullg?rd wrote:
> Diego Biurrun <diego at biurrun.de> writes:
> 
> > On Sun, Feb 12, 2006 at 03:45:19PM +0000, M?ns Rullg?rd wrote:
> >> M?ns Rullg?rd <mru at inprovide.com> writes:
> >> 
> > cerebus:~/src/ffmpeg$ make distclean
> > make -C libavutil clean
> > make[1]: Entering directory `/home/diego/src/ffmpeg/libavutil'
> > Makefile:33: '/home/diego/src/ffmpeg'/common.mak: No such file or
> > directory
> > make[1]: *** No rule to make target
> > `'/home/diego/src/ffmpeg'/common.mak'.  Stop.
> > make[1]: Leaving directory `/home/diego/src/ffmpeg/libavutil'
> > make: *** [clean] Error 2
> >
> > It seems to dislike the quotes...  I'll remove them from configure.
> 
> Something like this should do it:
> 
> --- configure   11 Feb 2006 20:37:12 -0000      1.248
> +++ configure   12 Feb 2006 23:08:08 -0000
> @@ -1889,10 +1889,9 @@
>      for f in $FILES ; do
>          ln -sf "$source_path/$f" $f
>      done
> -    echo "SRC_PATH=$source_path" >> config.mak
> -else
> -    echo "SRC_PATH='$source_path'" >> config.mak
>  fi
> +echo "SRC_PATH=$source_path" >> config.mak
> +echo "BUILD_ROOT=$PWD" >> config.mak

Oh, right, I just removed the quotes without noticing that the line is
duplicated now.  No wonder, I'm dead-tired...

Diego