Merge lp:~andrea.corbellini/beeseek/sniffer-make-install into lp:beeseek

Proposed by Andrea Corbellini
Status: Merged
Merged at revision: 42
Proposed branch: lp:~andrea.corbellini/beeseek/sniffer-make-install
Merge into: lp:beeseek
Diff against target: 38 lines (+14/-8)
2 files modified
.bzrignore (+1/-1)
trackers/sniffer/Makefile (+13/-7)
To merge this branch: bzr merge lp:~andrea.corbellini/beeseek/sniffer-make-install
Reviewer Review Type Date Requested Status
Andrea Colangelo Approve
Lorenzo Allegrucci Approve
Review via email: mp+29539@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Lorenzo Allegrucci (l-allegrucci) wrote :

it looks ok

review: Approve
41. By Andrea Corbellini

Use PREFIX instead of hardcoding /usr/local.

Revision history for this message
Andrea Colangelo (warp10) wrote :

Maintainers love PREFIX! :)
Great work, ty!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2010-07-08 07:22:54 +0000
3+++ .bzrignore 2010-07-09 15:37:40 +0000
4@@ -1,2 +1,2 @@
5 node/beeseek/_version_info.py
6-trackers/sniffer/beeseek-sniffer
7+trackers/sniffer/build/
8
9=== modified file 'trackers/sniffer/Makefile'
10--- trackers/sniffer/Makefile 2010-07-08 07:22:26 +0000
11+++ trackers/sniffer/Makefile 2010-07-09 15:37:40 +0000
12@@ -11,13 +11,19 @@
13 GCC := $(GCC) -DBfVerbose
14 endif
15
16-
17-build: beeseek-sniffer
18-beeseek-sniffer:
19- $(GCC) $(GCC_OPTS) -Wall -Iinclude/ -o beeseek-sniffer src/*.c -lpcap
20-
21-check: build
22+PREFIX := /usr/local
23+
24+
25+build:
26+ mkdir -p build/
27+ $(GCC) $(GCC_OPTS) -Wall -Iinclude/ -o build/beeseek-sniffer src/*.c -lpcap
28+
29+install: build
30+ mkdir -p /usr/local/bin/
31+ mv build/beeseek-sniffer $(PREFIX)/bin/
32+
33+check:
34 make -C ../../ -f tools/test-sniffer
35
36 clean:
37- rm -f beeseek-sniffer
38+ rm -rf build/

Subscribers

People subscribed via source and target branches