wvdial/wvdial-1.56.patch



    1 diff -Nru wvdial-1.55.orig/Makefile wvdial-1.55/Makefile
    2 --- wvdial-1.55.orig/Makefile	2006-02-12 19:22:27.000000000 +0100
    3 +++ wvdial-1.55/Makefile	2006-02-12 20:55:49.000000000 +0100
    4 @@ -1,30 +1,22 @@
    5  ifeq ($(TOPDIR),)
    6   TOPDIR=.
    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)/libuniconf.a $(WVS)/libwvstreams.a $(WVS)/libwvutils.a $(WVS)/libwvbase.a $(WVS)/xplc/libxplc-cxx.a -lcrypto -lssl
   29  else
   30   XPATH=$(TOPDIR)/src
   31  endif
   32  
   33  BINDIR=${prefix}/bin
   34 -MANDIR=${prefix}/share/man
   35 -PPPDIR=/etc/ppp/peers
   36 +MANDIR=${prefix}/man
   37 +PPPDIR=$(DESTDIR)/etc/ppp/peers
   38 +
   39 +VERBOSE=1
   40  
   41  include $(TOPDIR)/wvrules.mk
   42  
   43 @@ -38,7 +30,7 @@
   44  ifeq ($(WVSTREAMS_LIB),)
   45   LIBUNICONF:=-luniconf
   46  endif
   47 -wvdial wvdialconf papchaptest pppmon: wvdial.a $(LIBUNICONF)
   48 +wvdial wvdialconf papchaptest pppmon: wvdial.a 
   49  
   50  install-bin: all
   51  	[ -d ${BINDIR}      ] || install -d ${BINDIR}