Lines 1-8
Link Here
|
1 |
|
1 |
--- ./Makefile.orig 2010-09-21 08:06:59.000000000 +0200 |
2 |
$FreeBSD: ports/misc/libpri/files/patch-Makefile,v 1.9 2009/09/09 00:21:37 sobomax Exp $ |
2 |
+++ ./Makefile 2010-09-21 08:11:14.000000000 +0200 |
3 |
|
|
|
4 |
--- Makefile.orig |
5 |
+++ Makefile |
6 |
@@ -27,7 +27,7 @@ |
3 |
@@ -27,7 +27,7 @@ |
7 |
# Uncomment if you want libpri to count number of Q921/Q931 sent/received |
4 |
# Uncomment if you want libpri to count number of Q921/Q931 sent/received |
8 |
#LIBPRI_COUNTERS=-DLIBPRI_COUNTERS |
5 |
#LIBPRI_COUNTERS=-DLIBPRI_COUNTERS |
Lines 12-18
Link Here
|
12 |
GREP=grep |
9 |
GREP=grep |
13 |
AWK=awk |
10 |
AWK=awk |
14 |
|
11 |
|
15 |
@@ -37,15 +37,15 @@ |
12 |
@@ -37,7 +37,7 @@ |
16 |
# SONAME version; should be changed on every ABI change |
13 |
# SONAME version; should be changed on every ABI change |
17 |
# please don't change it needlessly; it's perfectly fine to have a SONAME |
14 |
# please don't change it needlessly; it's perfectly fine to have a SONAME |
18 |
# of 1.2 and a version of 1.4.x |
15 |
# of 1.2 and a version of 1.4.x |
Lines 21-38
Link Here
|
21 |
|
18 |
|
22 |
STATIC_LIBRARY=libpri.a |
19 |
STATIC_LIBRARY=libpri.a |
23 |
DYNAMIC_LIBRARY:=libpri.so.$(SONAME) |
20 |
DYNAMIC_LIBRARY:=libpri.so.$(SONAME) |
24 |
STATIC_OBJS=copy_string.o pri.o q921.o prisched.o q931.o pri_facility.o version.o |
21 |
@@ -83,9 +83,9 @@ |
25 |
DYNAMIC_OBJS=copy_string.lo pri.lo q921.lo prisched.lo q931.lo pri_facility.lo version.lo |
22 |
rose_qsig_mwi.lo \ |
26 |
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) |
23 |
rose_qsig_name.lo \ |
|
|
24 |
version.lo |
25 |
-CFLAGS=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g -fPIC $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) |
27 |
-INSTALL_PREFIX=$(DESTDIR) |
26 |
-INSTALL_PREFIX=$(DESTDIR) |
28 |
-INSTALL_BASE=/usr |
27 |
-INSTALL_BASE=/usr |
29 |
+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) |
28 |
+CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -g $(ALERTING) $(LIBPRI_COUNTERS) $(LIBPRI_OPT) |
30 |
+INSTALL_PREFIX=$(PREFIX) |
29 |
+INSTALL_PREFIX=$(PREFIX) |
31 |
+INSTALL_BASE= |
30 |
+INSTALL_BASE= |
32 |
libdir?=$(INSTALL_BASE)/lib |
31 |
libdir?=$(INSTALL_BASE)/lib |
33 |
SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY) |
32 |
SOFLAGS:=-Wl,-h$(DYNAMIC_LIBRARY) |
34 |
LDCONFIG = /sbin/ldconfig |
33 |
LDCONFIG = /sbin/ldconfig |
35 |
@@ -55,7 +55,7 @@ |
34 |
@@ -95,7 +95,7 @@ |
36 |
ifeq (${OSARCH},FreeBSD) |
35 |
ifeq (${OSARCH},FreeBSD) |
37 |
LDCONFIG_FLAGS=-m |
36 |
LDCONFIG_FLAGS=-m |
38 |
CFLAGS += -I../zaptel -I../zapata |
37 |
CFLAGS += -I../zaptel -I../zapata |
Lines 41-47
Link Here
|
41 |
endif |
40 |
endif |
42 |
endif |
41 |
endif |
43 |
ifeq (${OSARCH},SunOS) |
42 |
ifeq (${OSARCH},SunOS) |
44 |
@@ -100,12 +100,12 @@ |
43 |
@@ -147,12 +147,12 @@ |
45 |
mkdir -p $(INSTALL_PREFIX)$(libdir) |
44 |
mkdir -p $(INSTALL_PREFIX)$(libdir) |
46 |
mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include |
45 |
mkdir -p $(INSTALL_PREFIX)$(INSTALL_BASE)/include |
47 |
ifneq (${OSARCH},SunOS) |
46 |
ifneq (${OSARCH},SunOS) |
Lines 49-55
Link Here
|
49 |
- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) |
48 |
- install -m 755 $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) |
50 |
+ $(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include |
49 |
+ $(BSD_INSTALL_DATA) libpri.h $(INSTALL_PREFIX)$(INSTALL_BASE)/include |
51 |
+ $(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) |
50 |
+ $(BSD_INSTALL_PROGRAM) $(DYNAMIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) |
52 |
if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi |
51 |
#if [ -x /usr/sbin/sestatus ] && ( /usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled"); then /sbin/restorecon -v $(INSTALL_PREFIX)$(libdir)/$(DYNAMIC_LIBRARY); fi |
53 |
( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so) |
52 |
( cd $(INSTALL_PREFIX)$(libdir) ; ln -sf libpri.so.$(SONAME) libpri.so) |
54 |
- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) |
53 |
- install -m 644 $(STATIC_LIBRARY) $(INSTALL_PREFIX)$(libdir) |
55 |
- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi |
54 |
- if test $$(id -u) = 0; then $(LDCONFIG) $(LDCONFIG_FLAGS) $(INSTALL_PREFIX)$(libdir); fi |
Lines 58-64
Link Here
|
58 |
else |
57 |
else |
59 |
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h |
58 |
install -f $(INSTALL_PREFIX)$(INSTALL_BASE)/include -m 644 libpri.h |
60 |
install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY) |
59 |
install -f $(INSTALL_PREFIX)$(libdir) -m 755 $(DYNAMIC_LIBRARY) |
61 |
@@ -138,7 +138,7 @@ |
60 |
@@ -188,7 +188,7 @@ |
62 |
$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< |
61 |
$(CC) $(CFLAGS) $(MAKE_DEPS) -c -o $@ $< |
63 |
|
62 |
|
64 |
%.lo: %.c |
63 |
%.lo: %.c |
Lines 67-73
Link Here
|
67 |
|
66 |
|
68 |
$(STATIC_LIBRARY): $(STATIC_OBJS) |
67 |
$(STATIC_LIBRARY): $(STATIC_OBJS) |
69 |
ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS) |
68 |
ar rcs $(STATIC_LIBRARY) $(STATIC_OBJS) |
70 |
@@ -146,7 +146,7 @@ |
69 |
@@ -196,7 +196,7 @@ |
71 |
|
70 |
|
72 |
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) |
71 |
$(DYNAMIC_LIBRARY): $(DYNAMIC_OBJS) |
73 |
$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) |
72 |
$(CC) -shared $(SOFLAGS) -o $@ $(DYNAMIC_OBJS) |