|
Lines 1-7
Link Here
|
| 1 |
--- Makefile.orig 2010-07-01 04:58:35.000000000 +0900 |
1 |
--- Makefile.orig 2013-10-06 20:52:05.000000000 +0200 |
| 2 |
+++ Makefile 2010-08-01 01:26:30.000000000 +0900 |
2 |
+++ Makefile 2013-10-19 13:02:24.000000000 +0200 |
| 3 |
@@ -1,9 +1,9 @@ |
3 |
@@ -1,9 +1,9 @@ |
| 4 |
VERSION=v2.3 |
4 |
VERSION=v2.4 |
| 5 |
|
5 |
|
| 6 |
-prefix=/usr/local |
6 |
-prefix=/usr/local |
| 7 |
+prefix=${PREFIX} |
7 |
+prefix=${PREFIX} |
|
Lines 13-19
Link Here
|
| 13 |
|
13 |
|
| 14 |
SYS=posix |
14 |
SYS=posix |
| 15 |
#SYS=mingw |
15 |
#SYS=mingw |
| 16 |
@@ -20,8 +20,9 @@ |
16 |
@@ -21,8 +21,9 @@ |
| 17 |
|
17 |
|
| 18 |
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
18 |
DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) |
| 19 |
OPT=-O2 |
19 |
OPT=-O2 |
|
Lines 25-36
Link Here
|
| 25 |
|
25 |
|
| 26 |
bindir=$(prefix)/bin |
26 |
bindir=$(prefix)/bin |
| 27 |
sbindir=$(prefix)/sbin |
27 |
sbindir=$(prefix)/sbin |
| 28 |
@@ -37,7 +38,7 @@ |
28 |
@@ -41,7 +42,7 @@ |
| 29 |
|
|
|
| 30 |
THREADLIB_posix=-lpthread |
29 |
THREADLIB_posix=-lpthread |
|
|
30 |
THREADLIB_darwin=-lpthread |
| 31 |
THREADLIB_mingw= |
31 |
THREADLIB_mingw= |
| 32 |
-THREADLIB=$(THREADLIB_$(SYS)) |
32 |
-THREADLIB=$(THREADLIB_$(SYS)) |
| 33 |
+THREADLIB?=$(THREADLIB_$(SYS)) |
33 |
+THREADLIB?=$(THREADLIB_$(SYS)) |
| 34 |
SLIBS=$(THREADLIB) $(LIBS) |
34 |
SLIBS=$(THREADLIB) $(LIBS) |
| 35 |
|
35 |
|
| 36 |
LIBRTMP=librtmp/librtmp.a |
36 |
LIBRTMP=librtmp/librtmp.a |
|
|
37 |
@@ -79,7 +80,7 @@ |
| 38 |
$(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS) |
| 39 |
|
| 40 |
rtmpsrv: rtmpsrv.o thread.o |
| 41 |
- $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) |
| 42 |
+ $(CC) -Llibrtmp -lrtmp $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) |
| 43 |
|
| 44 |
rtmpsuck: rtmpsuck.o thread.o |
| 45 |
$(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS) |