|
Lines 1-6
Link Here
|
| 1 |
--- Makefile.orig Mon Apr 23 20:29:18 2007 |
1 |
--- Makefile.orig 2010-01-11 16:28:21.863788110 +0100 |
| 2 |
+++ Makefile Thu May 3 13:48:19 2007 |
2 |
+++ Makefile 2010-01-11 16:32:04.806025041 +0100 |
| 3 |
@@ -3,4 +3,7 @@ |
3 |
@@ -1,8 +1,11 @@ |
|
|
4 |
# $Id: Makefile,v 1.12 2010/01/08 18:31:22 max Exp $ |
| 5 |
# $FreeBSD$ |
| 4 |
|
6 |
|
| 5 |
-BINDIR= /usr/local/bin |
7 |
-BINDIR= /usr/local/bin |
| 6 |
-MANDIR= /usr/local/man/man |
8 |
-MANDIR= /usr/local/man/man |
|
Lines 10-27
Link Here
|
| 10 |
+BINDIR= ${PREFIX}/bin |
12 |
+BINDIR= ${PREFIX}/bin |
| 11 |
+MANDIR= ${PREFIX}/man/man |
13 |
+MANDIR= ${PREFIX}/man/man |
| 12 |
PROG= obexapp |
14 |
PROG= obexapp |
| 13 |
@@ -15,4 +18,4 @@ |
15 |
MAN1= obexapp.1 |
|
|
16 |
|
| 17 |
@@ -13,12 +16,11 @@ |
| 18 |
|
| 19 |
DEBUG_FLAGS= -g |
| 14 |
|
20 |
|
| 15 |
-CFLAGS+= -I/usr/local/include \ |
21 |
-CFLAGS+= -I/usr/local/include \ |
| 16 |
- -I/usr/local/include/openobex \ |
22 |
- -I/usr/local/include/openobex |
| 17 |
+CFLAGS+= -idirafter ${LOCALBASE}/include \ |
23 |
+CFLAGS+= -idirafter ${LOCALBASE}/include \ |
| 18 |
+ -I${LOCALBASE}/include/openobex \ |
24 |
+ -I${LOCALBASE}/include/openobex |
| 19 |
-fno-strict-aliasing |
25 |
|
| 20 |
@@ -20,3 +23,3 @@ |
|
|
| 21 |
DPADD= ${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML} ${LIBREADLINE} |
26 |
DPADD= ${LIBBLUETOOTH} ${LIBSDP} ${LIBBSDXML} ${LIBREADLINE} |
| 22 |
-LDADD= -L/usr/lib -L/usr/local/lib \ |
27 |
-LDADD= -L/usr/lib -L/usr/local/lib \ |
| 23 |
+LDADD= -L/usr/lib -L${LOCALBASE}/lib \ |
28 |
+LDADD= -L/usr/lib -L${LOCALBASE}/lib \ |
| 24 |
-lbluetooth -lsdp -lopenobex -lbsdxml -lreadline -liconv |
29 |
-lbluetooth -lsdp -lopenobex -lbsdxml -lreadline -liconv |
| 25 |
@@ -24,2 +27 @@ |
30 |
|
| 26 |
.include <bsd.prog.mk> |
31 |
.include <bsd.prog.mk> |
| 27 |
- |
32 |
- |