diff options
| -rw-r--r-- | patches/wireless_tools.30.pre7/generic/series | 1 | ||||
| -rw-r--r-- | patches/wireless_tools.30.pre7/generic/wireless_tools.30.pre7-destdir.diff | 30 | ||||
| -rw-r--r-- | rules/wireless.make | 12 |
3 files changed, 40 insertions, 3 deletions
diff --git a/patches/wireless_tools.30.pre7/generic/series b/patches/wireless_tools.30.pre7/generic/series new file mode 100644 index 000000000..b71247c45 --- /dev/null +++ b/patches/wireless_tools.30.pre7/generic/series @@ -0,0 +1 @@ +wireless_tools.30.pre7-destdir.diff diff --git a/patches/wireless_tools.30.pre7/generic/wireless_tools.30.pre7-destdir.diff b/patches/wireless_tools.30.pre7/generic/wireless_tools.30.pre7-destdir.diff new file mode 100644 index 000000000..b32dff802 --- /dev/null +++ b/patches/wireless_tools.30.pre7/generic/wireless_tools.30.pre7-destdir.diff @@ -0,0 +1,30 @@ +Subject: add DESTDIR support for wireless-tools +From: Robert Schwebel <r.schwebel@pengutronix.de> + +The Makefile is not DESTDIR aware. Fix it. + +Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de> + +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +Index: wireless_tools.30.pre7/Makefile +=================================================================== +--- wireless_tools.30.pre7.orig/Makefile ++++ wireless_tools.30.pre7/Makefile +@@ -73,10 +73,10 @@ endif + DYNAMIC_LINK= libiw.so + + # Install directories +-INSTALL_DIR= $(PREFIX)/sbin +-INSTALL_LIB= $(PREFIX)/lib +-INSTALL_INC= $(PREFIX)/include +-INSTALL_MAN= $(PREFIX)/man ++INSTALL_DIR= $(DESTDIR)$(PREFIX)/sbin ++INSTALL_LIB= $(DESTDIR)$(PREFIX)/lib ++INSTALL_INC= $(DESTDIR)$(PREFIX)/include ++INSTALL_MAN= $(DESTDIR)$(PREFIX)/man + + # Various commands + RM = rm -f diff --git a/rules/wireless.make b/rules/wireless.make index c4d51a42c..ae4086d8e 100644 --- a/rules/wireless.make +++ b/rules/wireless.make @@ -16,10 +16,11 @@ PACKAGES-$(PTXCONF_WIRELESS) += wireless # # Paths and names # -WIRELESS_VERSION = 28 +WIRELESS_VERSION = 30.pre7 WIRELESS = wireless_tools.$(WIRELESS_VERSION) WIRELESS_SUFFIX = tar.gz -WIRELESS_URL = http://pcmcia-cs.sourceforge.net/ftp/contrib/$(WIRELESS).$(WIRELESS_SUFFIX) +WIRELESS_URL = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$(WIRELESS).$(WIRELESS_SUFFIX) \ + http://pcmcia-cs.sourceforge.net/ftp/contrib/$(WIRELESS).$(WIRELESS_SUFFIX) WIRELESS_SOURCE = $(SRCDIR)/$(WIRELESS).$(WIRELESS_SUFFIX) WIRELESS_DIR = $(BUILDDIR)/$(WIRELESS) @@ -48,6 +49,8 @@ $(STATEDIR)/wireless.extract: $(wireless_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(WIRELESS_DIR)) @$(call extract, WIRELESS) + # FIXME: move the pre version + mv $(BUILDDIR)/wireless_tools.30 $(WIRELESS_DIR) @$(call patchin, WIRELESS) @$(call touch, $@) @@ -77,7 +80,8 @@ wireless_compile: $(STATEDIR)/wireless.compile $(STATEDIR)/wireless.compile: $(wireless_compile_deps_default) @$(call targetinfo, $@) - cd $(WIRELESS_DIR) && $(WIRELESS_PATH) $(WIRELESS_ENV) make CC=${CROSS_CC} + cd $(WIRELESS_DIR) && $(WIRELESS_PATH) $(WIRELESS_ENV) \ + make CC=${CROSS_CC} PREFIX=/usr @$(call touch, $@) # ---------------------------------------------------------------------------- @@ -88,6 +92,8 @@ wireless_install: $(STATEDIR)/wireless.install $(STATEDIR)/wireless.install: $(wireless_install_deps_default) @$(call targetinfo, $@) + cd $(WIRELESS_DIR) && $(WIRELESS_PATH) $(WIRELESS_ENV) \ + make install-hdr CC=${CROSS_CC} PREFIX=/usr @$(call touch, $@) # ---------------------------------------------------------------------------- |