blob: 1fabbf8c7adf2ce6299bee541718ec3edff88d3e (
plain)
1 diff -Nru wvdial-1.61.orig/Makefile.in wvdial-1.61/Makefile.in
2 --- wvdial-1.61.orig/Makefile.in 2016-10-29 12:11:27.722154180 +0200
3 +++ wvdial-1.61/Makefile.in 2016-10-29 12:12:31.096513061 +0200
4 @@ -3,27 +3,19 @@
5 WVPACKAGE_TARNAME=@PACKAGE_TARNAME@
6 WVPACKAGE_VERSION=@PACKAGE_VERSION@
7
8 -prefix=/usr/local
9 -WVSTREAMS_INC=
10 -WVSTREAMS_LIB=
11 +prefix=$(DESTDIR)/usr
12 +WVSTREAMS_INC=$(WVS)/include
13 +WVSTREAMS_LIB=$(WVS)
14 WVSTREAMS_BIN=$(prefix)/bin
15 WVSTREAMS_SRC=.
16
17 -PC_CFLAGS=$(shell pkg-config --cflags libwvstreams)
18 -ifeq ($(PC_CFLAGS),)
19 - $(error WvStreams does not appear to be installed)
20 -endif
21 -CPPFLAGS+=$(PC_CFLAGS)
22 -
23 -PC_LIBS=$(shell pkg-config --libs libwvstreams)
24 -ifeq ($(PC_LIBS),)
25 - $(error WvStreams does not appear to be installed)
26 -endif
27 -LIBS+=$(PC_LIBS)
28 +LIBS = $(WVS)/libwvstatic.a -lstdc++ -lcrypto -lssl
29
30 BINDIR=${prefix}/bin
31 MANDIR=${prefix}/share/man
32 -PPPDIR=/etc/ppp/peers
33 +PPPDIR=$(DESTDIR)/etc/ppp/peers
34 +
35 +VERBOSE=1
36
37 include wvrules.mk
38
39 @@ -33,9 +25,6 @@
40 wvdial.a: wvdialer.o wvmodemscan.o wvpapchap.o wvdialbrain.o \
41 wvdialmon.o
42
43 -wvdial wvdialconf papchaptest pppmon: \
44 - LDFLAGS+=-luniconf -lwvstreams -lwvutils -lwvbase
45 -
46 wvdial wvdialconf papchaptest pppmon: wvdial.a
47
48 install-bin: all
49 diff -Nru wvdial-1.61.orig/config.defaults.mk wvdial-1.61/config.defaults.mk
50 --- wvdial-1.61.orig/config.defaults.mk 2016-10-29 12:11:27.722154180 +0200
51 +++ wvdial-1.61/config.defaults.mk 2016-10-29 12:11:55.997788968 +0200
52 @@ -13,7 +13,6 @@
53 LIBS_PAM=-lpam
54 LIBS_TCL=
55
56 -prefix=/usr/local
57 datadir=${prefix}/share
58 includedir=${prefix}/include
59 infodir=${prefix}/share/info
60 @@ -28,8 +27,8 @@
61 libexecdir=${exec_prefix}/libexec
62 sbindir=${exec_prefix}/sbin
63
64 -enable_debug=yes
65 -enable_optimization=no
66 +enable_debug=no
67 +enable_optimization=yes
68 enable_resolver_fork=
69 enable_warnings=
70 enable_testgui=
|
