[pkg-wpa-devel] r1372 - in /wireless-regdb/trunk/debian: patches/do_not_sign_regulatory_bin.patch rules

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun May 10 18:15:37 2009
New Revision: 1372

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1372
Log:
set/override CRDA_PATH in debian/rules instead of in patch^Whack

Modified:
    wireless-regdb/trunk/debian/patches/do_not_sign_regulatory_bin.patch
    wireless-regdb/trunk/debian/rules

Modified: wireless-regdb/trunk/debian/patches/do_not_sign_regulatory_bin.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/patches/do_not_sign_regulatory_bin.patch?rev=1372&op=diff
==============================================================================
--- wireless-regdb/trunk/debian/patches/do_not_sign_regulatory_bin.patch (original)
+++ wireless-regdb/trunk/debian/patches/do_not_sign_regulatory_bin.patch Sun May 10 18:15:37 2009
@@ -5,14 +5,10 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -1,112 +1,24 @@
- # Install prefix
--PREFIX ?= /usr
--CRDA_PATH ?= $(PREFIX)/lib/crda
--CRDA_KEY_PATH ?= $(CRDA_PATH)/pubkeys
--
--MANDIR ?= $(PREFIX)/share/man/
--
+@@ -5,108 +5,27 @@ CRDA_KEY_PATH ?= $(CRDA_PATH)/pubkeys
+ 
+ MANDIR ?= $(PREFIX)/share/man/
+ 
 -SHA1SUM ?= /usr/bin/sha1sum
 -LSB_RELEASE ?= /usr/bin/lsb_release
 -WHOAMI ?= /usr/bin/whoami
@@ -40,22 +36,19 @@
 -REGDB_PRIVKEY ?= ~/.wireless-regdb-$(REGDB_AUTHOR).key.priv.pem
 -REGDB_PUBKEY ?= $(REGDB_AUTHOR).key.pub.pem
 -
--REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem
--
+ REGDB_UPSTREAM_PUBKEY ?= linville.key.pub.pem
+ 
 -REGDB_CHANGED = $(shell $(SHA1SUM) -c --status sha1sum.txt; \
 -        if [ $$? -eq 0 ]; then \
 -                echo ; \
 -        else \
 -                echo maintainer-clean $(REGDB_PUBKEY); \
 -        fi)
-+CRDA_PATH ?= /lib/crda
- 
+-
 -.PHONY: all clean mrproper install maintainer-clean install-distro-key
-+MANDIR ?= /usr/share/man/
++.PHONY: all clean install
  
 -all: $(REGDB_CHANGED) regulatory.bin
-+.PHONY: all clean install
-+
 +all: regulatory.bin
  
  clean:
@@ -114,12 +107,12 @@
 -#	sudo make install
  install: regulatory.bin.5.gz
  	install -m 755 -d $(DESTDIR)/$(CRDA_PATH)
--	install -m 755 -d $(DESTDIR)/$(CRDA_KEY_PATH)
+ 	install -m 755 -d $(DESTDIR)/$(CRDA_KEY_PATH)
 -	if [ -f .custom ]; then \
 -		install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(shell cat .custom); \
 -	fi
--	@# In linville we trust
--	install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(REGDB_UPSTREAM_PUBKEY)
+ 	@# In linville we trust
+ 	install -m 644 -t $(DESTDIR)/$(CRDA_KEY_PATH)/ $(REGDB_UPSTREAM_PUBKEY)
  	install -m 644 -t $(DESTDIR)/$(CRDA_PATH)/ regulatory.bin
  	install -m 755 -d $(DESTDIR)/$(MANDIR)/man5/
  	install -m 644 -t $(DESTDIR)/$(MANDIR)/man5/ regulatory.bin.5.gz

Modified: wireless-regdb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/wireless-regdb/trunk/debian/rules?rev=1372&op=diff
==============================================================================
--- wireless-regdb/trunk/debian/rules (original)
+++ wireless-regdb/trunk/debian/rules Sun May 10 18:15:37 2009
@@ -1,3 +1,7 @@
 #!/usr/bin/make -f
+
+CRDA_PATH := /lib/crda
+export CRDA_PATH
+
 %:
 	dh --with quilt $@