| File: net/pppd/files/gar-base.diff | |
|---|---|
| base-0 | patch-1 |
| Line 1 | Line 1 |
| diff -Nru tmp/ppp-2.4.1/contrib/pppgetpass/Makefile.linux work/ppp-2.4.1/contrib/pppgetpass/Makefile.linux --- tmp/ppp-2.4.1/contrib/pppgetpass/Makefile.linux Sun Nov 14 20:08:24 1999 +++ work/ppp-2.4.1/contrib/pppgetpass/Makefile.linux Sun Mar 3 00:08:56 2002 | diff --speed-large-files --minimal -Nru scratch/ppp-2.4.1/chat/Makefile.linux work/main.d/ppp-2.4.1/chat/Makefile.linux --- scratch/ppp-2.4.1/chat/Makefile.linux 1999-08-12 20:54:32.000000000 -0500 +++ work/main.d/ppp-2.4.1/chat/Makefile.linux 2003-10-11 19:21:30.000000000 -0500 @@ -1,19 +1,18 @@ # $Id: gar-base.diff,v 1.2 2003/10/12 01:11:56 inkblot Exp $ -CDEF1= -DTERMIOS # Use the termios structure -CDEF2= -DSIGTYPE=void # Standard definition -CDEF3= -UNO_SLEEP # Use the usleep function -CDEF4= -DFNDELAY=O_NDELAY # Old name value -CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) +CDEFS += -DTERMIOS # Use the termios structure +CDEFS += -DSIGTYPE=void # Standard definition +CDEFS += -UNO_SLEEP # Use the usleep function +CDEFS += -DFNDELAY=O_NDELAY # Old name value -CFLAGS= -O2 -g -pipe $(CDEFS) +CFLAGS = -O2 -g -pipe $(CDEFS) $(COPTS) INSTALL= install all: chat chat: chat.o - $(CC) -o chat chat.o + $(CC) $(LDFLAGS) -o chat chat.o chat.o: chat.c $(CC) -c $(CFLAGS) -o chat.o chat.c diff --speed-large-files --minimal -Nru scratch/ppp-2.4.1/contrib/pppgetpass/Makefile.linux work/main.d/ppp-2.4.1/contrib/pppgetpass/Makefile.linux --- scratch/ppp-2.4.1/contrib/pppgetpass/Makefile.linux 1999-11-14 22:08:24.000000000 -0600 +++ work/main.d/ppp-2.4.1/contrib/pppgetpass/Makefile.linux 2003-10-11 19:20:04.000000000 -0500 |
| Line | Line |
| install: all install -m 755 pppgetpass.sh /usr/bin/pppgetpass - install -m 4755 -o root -g root pppgetpass.vt /usr/bin/ - install -m 755 -o root -g root pppgetpass.gtk /usr/X11/bin/ | install: all install -m 755 pppgetpass.sh /usr/bin/pppgetpass - install -m 4755 -o root -g root pppgetpass.vt /usr/bin/ - install -m 755 -o root -g root pppgetpass.gtk /usr/X11/bin/ |
| + install -m 755 pppgetpass.vt /usr/bin/ + install -m 755 pppgetpass.gtk /usr/X11/bin/ | + install -m 755 pppgetpass.vt $(DESTDIR)$(bindir) + install -m 755 pppgetpass.gtk $(DESTDIR)$(bindir) |
| clean: rm -f *.o pppgetpass.gtk pppgetpass.vt core | clean: rm -f *.o pppgetpass.gtk pppgetpass.vt core |
| diff -Nru tmp/ppp-2.4.1/linux/Makefile.top work/ppp-2.4.1/linux/Makefile.top --- tmp/ppp-2.4.1/linux/Makefile.top Mon Apr 17 03:39:26 2000 +++ work/ppp-2.4.1/linux/Makefile.top Sun Mar 3 00:08:56 2002 @@ -1,9 +1,9 @@ # PPP top-level Makefile for Linux. -BINDIR = $(DESTDIR)/usr/sbin -MANDIR = $(DESTDIR)/usr/man -ETCDIR = $(DESTDIR)/etc/ppp +BINDIR = $(bindir) +MANDIR = $(mandir) +ETCDIR = $(sysconfdir)/ppp # uid 0 = root INSTALL= install diff -Nru tmp/ppp-2.4.1/pppd/Makefile.linux work/ppp-2.4.1/pppd/Makefile.linux --- tmp/ppp-2.4.1/pppd/Makefile.linux Wed Mar 7 21:00:35 2001 +++ work/ppp-2.4.1/pppd/Makefile.linux Sun Mar 3 00:10:08 2002 @@ -4,7 +4,7 @@ # # Default installation locations -BINDIR = /usr/sbin +BINDIR = $(bindir) MANDIR = /usr/man PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap.c md5.c ccp.c \ | diff --speed-large-files --minimal -Nru scratch/ppp-2.4.1/pppd/Makefile.linux work/main.d/ppp-2.4.1/pppd/Makefile.linux --- scratch/ppp-2.4.1/pppd/Makefile.linux 2001-03-07 23:00:35.000000000 -0600 +++ work/main.d/ppp-2.4.1/pppd/Makefile.linux 2003-10-11 19:20:04.000000000 -0500 |
| Line | Line |
| endif | endif |
| Line 49 | Line 53 |
| install: pppd mkdir -p $(BINDIR) $(MANDIR) | install: pppd mkdir -p $(BINDIR) $(MANDIR) |
| diff -Nru tmp/ppp-2.4.1/pppstats/Makefile.linux work/ppp-2.4.1/pppstats/Makefile.linux --- tmp/ppp-2.4.1/pppstats/Makefile.linux Tue Mar 24 18:21:19 1998 +++ work/ppp-2.4.1/pppstats/Makefile.linux Sun Mar 3 00:08:56 2002 | diff --speed-large-files --minimal -Nru scratch/ppp-2.4.1/pppstats/Makefile.linux work/main.d/ppp-2.4.1/pppstats/Makefile.linux --- scratch/ppp-2.4.1/pppstats/Makefile.linux 1998-03-24 20:21:19.000000000 -0600 +++ work/main.d/ppp-2.4.1/pppstats/Makefile.linux 2003-10-11 19:20:04.000000000 -0500 |
| Line | Line |
| COMPILE_FLAGS = -D_linux_ -I../include LIBS = | COMPILE_FLAGS = -D_linux_ -I../include LIBS = |
| Line 61 | Line 65 |
| CFLAGS = $(COPTS) $(COMPILE_FLAGS) | CFLAGS = $(COPTS) $(COMPILE_FLAGS) |
| diff -Nru tmp/ppp-2.4.1/sunos4/Makedefs work/ppp-2.4.1/sunos4/Makedefs --- tmp/ppp-2.4.1/sunos4/Makedefs Mon Dec 22 02:03:57 1997 +++ work/ppp-2.4.1/sunos4/Makedefs Sun Mar 3 00:08:56 2002 | diff --speed-large-files --minimal -Nru scratch/ppp-2.4.1/sunos4/Makedefs work/main.d/ppp-2.4.1/sunos4/Makedefs --- scratch/ppp-2.4.1/sunos4/Makedefs 1997-12-22 04:03:57.000000000 -0600 +++ work/main.d/ppp-2.4.1/sunos4/Makedefs 2003-10-11 19:20:04.000000000 -0500 |
| Line | Line |
| # defines common to several Makefiles # | # defines common to several Makefiles # |