[alsa-devel] [PATCH] alsa-driver-build/Makefile: Support CONFIG_SND_KERNELDIR

[Stephen Warren]

Jaroslav Kysela wrote:
> 
> On Fri, 20 Aug 2010, Stephen Warren wrote:
> 
> > Some kernels define CONFIG_SND_KERNELDIR rather than CONFIG_SND_KERNELBUILD.
> > If the latter is not set, then use the former.
> >
> > Signed-off-by: Stephen Warren <swarren at swarren-lx2.nvidia.com>
> > ---
> > Makefile |    6 ++++++
> > 1 files changed, 6 insertions(+), 0 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 9af188f..59c477c 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -157,6 +157,12 @@ all-deps: toplevel.config.in acinclude.m4 include/config1.h.in
> > include/sndversions.h:
> > 	$(MAKE) dep
> >
> > +ifdef NEW_KBUILD
> > +  ifeq ("$(CONFIG_SND_KERNELBUILD)", "")
> > +    override CONFIG_SND_KERNELBUILD := $(CONFIG_SND_KERNELDIR)
> > +  endif
> > +endif
> > +
> > .PHONY: compile
> > compile: include/sndversions.h
> > ifdef NEW_KBUILD
> 
> Thanks. It's better to fix this issue in configure.in:

Yes, that works for me too.

> diff --git a/configure.in b/configure.in
> index 18b1440..e94cbe7 100644
> --- a/configure.in
> +++ b/configure.in
> @@ -124,6 +124,9 @@ AC_ARG_WITH(build,
>   if test -d "$kernelbuild"; then
>     kernelbuild=$(cd "$kernelbuild" && pwd)
>   fi
> +if test -z "$kernelbuild"; then
> +  kernelbuild="$kerneldir"
> +fi
>   CONFIG_SND_KERNELBUILD="$kernelbuild"
>   AC_MSG_RESULT($kernelbuild)

-- 
nvpublic