blob: 09aacfea5474ccecb54fb6518fcc6b6adbf23e96 (
plain)
1 diff -Nru wvdial-1.61.orig/Makefile.in wvdial-1.61/Makefile.in
2 --- wvdial-1.61.orig/Makefile.in 2009-09-30 09:28:10.000000000 +0200
3 +++ wvdial-1.61/Makefile.in 2009-09-30 09:31:22.000000000 +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 +MANDIR=${prefix}/man
34 +PPPDIR=$(DESTDIR)/etc/ppp/peers
35 +
36 +VERBOSE=1
37
38 include wvrules.mk
39
40 @@ -33,9 +25,6 @@
41 wvdial.a: wvdialer.o wvmodemscan.o wvpapchap.o wvdialbrain.o \
42 wvdialmon.o
43
44 -wvdial wvdialconf papchaptest pppmon: \
45 - LDFLAGS+=-luniconf -lwvstreams -lwvutils -lwvbase
46 -
47 wvdial wvdialconf papchaptest pppmon: wvdial.a
48
49 install-bin: all
50 diff -Nru wvdial-1.61.orig/config.defaults.mk wvdial-1.61/config.defaults.mk
51 --- wvdial-1.61.orig/config.defaults.mk 2009-09-30 09:28:10.000000000 +0200
52 +++ wvdial-1.61/config.defaults.mk 2009-09-30 10:06:24.000000000 +0200
53 @@ -13,7 +13,6 @@
54 LIBS_PAM=-lpam
55 LIBS_TCL=
56
57 -prefix=/usr/local
58 datadir=${prefix}/share
59 includedir=${prefix}/include
60 infodir=${prefix}/share/info
61 @@ -28,8 +27,8 @@
62 libexecdir=${exec_prefix}/libexec
63 sbindir=${exec_prefix}/sbin
64
65 -enable_debug=yes
66 -enable_optimization=no
67 +enable_debug=no
68 +enable_optimization=yes
69 enable_resolver_fork=
70 enable_warnings=
71 enable_testgui=
|
