[PATCH] iw: Makefile changes for easier packaging

[PATCH] iw: Makefile changes for easier packaging

[Robby Workman]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 140 bytes --]

Attached is a trivial patch to make packaging a bit easier.
No strong feelings either way, so rejection will cause no
hard feelings :-)

-RW

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1234 bytes --]

Trivial patch for easier packaging of iw
Signed-off-by: Robby Workman <rworkman@slackware.com>
---
diff --git a/Makefile b/Makefile
index 3fa0a83..df59b51 100644
--- a/Makefile
+++ b/Makefile
@@ -2,10 +2,14 @@
 
 MAKEFLAGS += --no-print-directory
 
+PREFIX ?= /usr
+BINDIR ?= $(PREFIX)/bin
+MANDIR ?= $(PREFIX)/share/man
+
 MKDIR ?= mkdir -p
 INSTALL ?= install
-PREFIX ?= /usr
 CC ?= "gcc"
+
 CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration `pkg-config --cflags libnl-1`
 CFLAGS += -O2 -g
 LDFLAGS += `pkg-config --libs libnl-1`
@@ -49,11 +53,11 @@ check:
 
 install: iw iw.8.gz
 	@$(NQ) ' INST iw'
-	$(Q)$(MKDIR) $(DESTDIR)$(PREFIX)/bin/
-	$(Q)$(INSTALL) -m 755 -o root -g root -t $(DESTDIR)$(PREFIX)/bin/ iw
+	$(Q)$(MKDIR) $(DESTDIR)$(BINDIR)
+	$(Q)$(INSTALL) -m 755 -t $(DESTDIR)$(BINDIR) iw
 	@$(NQ) ' INST iw.8'
-	$(Q)$(MKDIR) $(DESTDIR)$(PREFIX)/share/man/man8/
-	$(Q)$(INSTALL) -m 644 -o root -g root -t $(DESTDIR)$(PREFIX)/share/man/man8/ iw.8.gz
+	$(Q)$(MKDIR) $(DESTDIR)$(MANDIR)/man8/
+	$(Q)$(INSTALL) -m 644 -t $(DESTDIR)$(MANDIR)/man8/ iw.8.gz
 
 clean:
 	$(Q)rm -f iw *.o *~ *.gz version.h *-stamp

Re: [PATCH] iw: Makefile changes for easier packaging

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

On Tue, 2008-11-18 at 20:18 -0800, Robby Workman wrote:
> Attached is a trivial patch to make packaging a bit easier.
> No strong feelings either way, so rejection will cause no
> hard feelings :-)

Heh. You really should CC me, but I've applied it.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] iw: Makefile changes for easier packaging

[Robby Workman]

On Wed, 19 Nov 2008, Johannes Berg wrote:

> On Tue, 2008-11-18 at 20:18 -0800, Robby Workman wrote:
>> Attached is a trivial patch to make packaging a bit easier.
>> No strong feelings either way, so rejection will cause no
>> hard feelings :-)
>
> Heh. You really should CC me, but I've applied it.
>


Okay, thanks!  Re the CC, I probably overlooked it, but I didn't 
see iw listed in the Maintainers list on the wiki, and there was
no AUTHORS file in the source.  Either way, much appreciated.

-RW

Re: [PATCH] iw: Makefile changes for easier packaging

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

On Wed, 2008-11-19 at 08:18 -0800, Robby Workman wrote:

> Okay, thanks!  Re the CC, I probably overlooked it, but I didn't 
> see iw listed in the Maintainers list on the wiki, and there was
> no AUTHORS file in the source. 

Heh, sorry, I guess I figured it was fairly obvious since it's in git
and I commit everything, it's hosted on my server etc. I can add an
authors list or just add a note about who maintains it to the readme
file.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] iw: Makefile changes for easier packaging

[Robby Workman]

On Wed, 19 Nov 2008, Johannes Berg wrote:

> On Wed, 2008-11-19 at 08:18 -0800, Robby Workman wrote:
>
>> Okay, thanks!  Re the CC, I probably overlooked it, but I didn't
>> see iw listed in the Maintainers list on the wiki, and there was
>> no AUTHORS file in the source.
>
> Heh, sorry, I guess I figured it was fairly obvious since it's in git
> and I commit everything, it's hosted on my server etc. I can add an
> authors list or just add a note about who maintains it to the readme
> file.


Well... I didn't look at the previous commit history, but in hindsight,
I should have, and it *is* fairly obvious.  :-)  Thanks again.

-RW