Package: isdnutils / 1:3.25+dfsg1-3.5

use-packaged-libcapi20.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
Description: licapi20-3 is now in a seperate package
 To use the pakaged version of the library, the buildsystem needs some patching
 to avoid that it picks up the in-tree copy, namely removing include paths and
 library linker paths
Author: Tobias Frost <tobi@coldtobi.de>
Forwarded: not-needed, Debian specific
Last-Update: 2014-04-29
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/capifax/Makefile.am
+++ b/capifax/Makefile.am
@@ -7,9 +7,9 @@
 MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
 			  stamp-h.in
 
-INCLUDES = -I../capi20 $(all_includes)
+INCLUDES = $(all_includes)
 CFLAGS = -Wall -O2
-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+LDFLAGS = $(all_libraries)
 LDADD = -lcapi20
 
 bin_PROGRAMS = capifax capifaxrcvd
--- a/capiinfo/Makefile.am
+++ b/capiinfo/Makefile.am
@@ -7,9 +7,9 @@
 MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
 			  stamp-h.in comperr
 
-INCLUDES = -I../capi20 $(all_includes)
+INCLUDES = $(all_includes)
 CFLAGS = -Wall -O2
-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+LDFLAGS = $(all_libraries)
 LDADD = -lcapi20
 
 bin_PROGRAMS = capiinfo
--- a/rcapid/Makefile.am
+++ b/rcapid/Makefile.am
@@ -7,9 +7,9 @@
 MAINTAINERCLEANFILES    = configure aclocal.m4 Makefile.in config.h.in \
 			  stamp-h.in comperr
 
-INCLUDES = -I../capi20 $(all_includes)
+INCLUDES = $(all_includes)
 CFLAGS = -Wall -O2
-LDFLAGS = -L../capi20/.libs -L../capi20 $(all_libraries)
+LDFLAGS = $(all_libraries)
 LDADD = -lcapi20
 
 sbin_PROGRAMS = rcapid
--- a/Makefile
+++ b/Makefile
@@ -53,10 +53,10 @@
 endif
 
 ifeq ($(CONFIG_RCAPID),y)
-	SUBDIRS := $(SUBDIRS) capi20 capiinfo
+	SUBDIRS := $(SUBDIRS) capiinfo
 else
 	ifeq ($(CONFIG_AVMCAPICTRL),y)
-		SUBDIRS := $(SUBDIRS) capi20 capiinfo
+		SUBDIRS := $(SUBDIRS) capiinfo
 	endif
 endif