On Tue, Mar 3, 2009 at 6:44 PM, Daniel Mierswa <impulze@xxxxxxxxxxx> wrote: > Heya, i just found that there was a typo in your Makefile and > debian-examples dir. > I fixed those plus also give the user the chance to override CRDA_PATH > (I use /lib64 since I like the idea of having all necessary stuff to get > wireless connected in superuser reach). :) > Feedback welcomed. > > -- > Mierswa, Daniel > > If you still don't like it, that's ok: that's why I'm boss. I simply > know better than you do. > --- Linus Torvalds, comp.os.linux.advocacy, 1996/07/22 > > > > From 14a0da690de4e8803809f5da970b42c953990f03 Mon Sep 17 00:00:00 2001 > From: Daniel Mierswa <impulze@xxxxxxxxxxx> > Date: Thu, 5 Feb 2009 02:11:41 +0100 > Subject: [PATCH] CDRA_PATH typo, also let user override CRDA_PATH > > --- > Makefile | 6 +++--- > debian-example/rules | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/Makefile b/Makefile > index a719f59..32626a1 100644 > --- a/Makefile > +++ b/Makefile > @@ -1,6 +1,6 @@ > # Install prefix > PREFIX = /usr > -CDRA_PATH = $(PREFIX)/lib/crda > +CRDA_PATH ?= $(PREFIX)/lib/crda > > MANDIR ?= $(PREFIX)/share/man/ > > @@ -32,7 +32,7 @@ key.priv.pem: > # Distributions wishing to just use John's database > # can just call make install. > install: regulatory.bin.5.gz > - install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CDRA_PATH) > - install -o 0 -g 0 -m 644 regulatory.bin $(DESTDIR)/$(CDRA_PATH)/regulatory.bin > + install -o 0 -g 0 -m 755 -d $(DESTDIR)/$(CRDA_PATH) > + install -o 0 -g 0 -m 644 regulatory.bin $(DESTDIR)/$(CRDA_PATH)/regulatory.bin > mkdir -p $(DESTDIR)/$(MANDIR)/man5/ > install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz > diff --git a/debian-example/rules b/debian-example/rules > index dab9255..34a08a5 100755 > --- a/debian-example/rules > +++ b/debian-example/rules > @@ -3,8 +3,8 @@ > include /usr/share/cdbs/1/rules/debhelper.mk > > PREFIX = /usr > -CDRA_LIB = $(PREFIX)/lib/crda > +CRDA_LIB ?= $(PREFIX)/lib/crda > > install/wireless-regdb:: > - install -o 0 -g 0 -m 755 -d debian/$(cdbs_curpkg)/$(CDRA_LIB) > - install -o 0 -g 0 -m 644 regulatory.bin debian/$(cdbs_curpkg)/$(CDRA_LIB)/regulatory.bin > + install -o 0 -g 0 -m 755 -d debian/$(cdbs_curpkg)/$(CRDA_LIB) > + install -o 0 -g 0 -m 644 regulatory.bin debian/$(cdbs_curpkg)/$(CRDA_LIB)/regulatory.bin > -- Patch doesn't apply. mcgrof@tesla ~/devel/crda (git::master)$ git describe v1.0.1-10-g479ca1d mcgrof@tesla ~/devel/crda (git::master)$ patch -p1 < ../../patches/crda-fix-path.patch patching file Makefile Hunk #1 FAILED at 1. Hunk #2 FAILED at 32. 2 out of 2 hunks FAILED -- saving rejects to file Makefile.rej patching file debian-example/rules Hunk #1 FAILED at 3. 1 out of 1 hunk FAILED -- saving rejects to file debian-example/rules.rej Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
