Hey,
Applied (all three patches) and pushed to git.kernel.org. Thanks!
Best,
Dominik
On Tue, Jan 05, 2010 at 01:11:31PM +0000, Colin Watson wrote:
> On Tue, Jan 05, 2010 at 01:28:27PM +0100, Wolfram Sang wrote:
> > > diff --git a/Makefile b/Makefile
> > > index f4acfb3..e7ff190 100644
> > > --- a/Makefile
> > > +++ b/Makefile
> > > @@ -297,6 +297,9 @@ uninstall-tools:
> > > install-config:
> > > $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir)
> > > $(INSTALL_DATA) -D config/config.opts
> > > $(DESTDIR)$(pcmciaconfdir)/config.opts
> > > + if [ -f config/config.opts.$(ARCH) ]; then
> >
> > Missing backslash?
>
> Whoops, copy-and-paste error. Fix attached.
>
> > Or maybe better: add an arch-extension for the standard config.opts
> > and drop the above 'if' completely?
>
> It'd have to be one for each other possible architecture if we did that.
> I think I prefer this version ...
>
> Thanks,
>
> --
> Colin Watson [cjwat...@debian.org]
> From 9e12f435134c9f8075035fbe12b7e1e1d7780b1b Mon Sep 17 00:00:00 2001
> From: Colin Watson <cjwat...@debian.org>
> Date: Tue, 5 Jan 2010 12:11:13 +0000
> Subject: [PATCH 3/3] Use architecture-specific config.opts if it exists
>
> Originally by Per Olofsson <pe...@debian.org>.
>
> Signed-off-by: Colin Watson <cjwat...@debian.org>
> ---
> Makefile | 3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index f4acfb3..517b25c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -297,6 +297,9 @@ uninstall-tools:
> install-config:
> $(INSTALL) -d $(DESTDIR)$(pcmciaconfdir)
> $(INSTALL_DATA) -D config/config.opts
> $(DESTDIR)$(pcmciaconfdir)/config.opts
> + if [ -f config/config.opts.$(ARCH) ]; then \
> + $(INSTALL_DATA) -D config/config.opts.$(ARCH)
> $(DESTDIR)$(pcmciaconfdir)/config.opts; \
> + fi
>
> uninstall-config:
> # - rm -f $(DESTDIR)$(pcmciaconfdir)/config.opts
> --
> 1.6.3.3
>
_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
