--- ppp-2.4.2/chat/Makefile.linux.vns	2004-01-13 06:57:55 +0300
+++ ppp-2.4.2/chat/Makefile.linux	2004-05-28 11:59:01 +0400
@@ -6,8 +6,7 @@
 CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
 CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
 
-COPTS=	-O2 -g -pipe $(CDEFS)
-CFLAGS=	$(COPTS) $(CDEFS)
+CFLAGS=	$(CDEFS) $(RPM_OPT_FLAGS)
 
 INSTALL= install
 
@@ -20,9 +19,9 @@
 	$(CC) -c $(CFLAGS) -o chat.o chat.c
 
 install: chat
-	mkdir -p $(BINDIR)
-	$(INSTALL) -s -c chat $(BINDIR)
-	$(INSTALL) -c -m 644 chat.8 $(MANDIR)/man8
+	mkdir -p $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) -m 755 chat $(BINDIR)/
+	$(INSTALL) -m 644 chat.8 $(MANDIR)/man8/
 
 clean:
 	rm -f chat.o chat *~
--- ppp-2.4.2/linux/Makefile.top.vns	2002-09-07 14:37:49 +0400
+++ ppp-2.4.2/linux/Makefile.top	2004-05-28 11:56:52 +0400
@@ -3,7 +3,7 @@
 
 BINDIR = $(DESTDIR)/usr/sbin
 INCDIR = $(DESTDIR)/usr/include
-MANDIR = $(DESTDIR)/usr/man
+MANDIR = $(DESTDIR)/usr/share/man
 ETCDIR = $(DESTDIR)/etc/ppp
 
 # uid 0 = root
--- ppp-2.4.2/pppd/plugins/radius/radiusclient/etc/Makefile.am.vns	2002-11-09 14:24:42 +0300
+++ ppp-2.4.2/pppd/plugins/radius/radiusclient/etc/Makefile.am	2004-05-28 11:56:52 +0400
@@ -28,12 +28,12 @@
 	    <$(srcdir)/radiusclient.conf.in >radiusclient.conf
 
 install-data-local: realms servers
-	$(mkinstalldirs) $(pkgsysconfdir); \
-        echo " $(INSTALL) -m600 $(srcdir)/realms $(pkgsysconfdir)/realms"; \
-        $(INSTALL) -m600 $(srcdir)/realms $(pkgsysconfdir)/realms; \
-        echo " $(INSTALL) -m600 $(srcdir)/servers $(pkgsysconfdir)/servers"; \
-        $(INSTALL) -m600 $(srcdir)/servers $(pkgsysconfdir)/servers
+	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir); \
+        echo " $(INSTALL) -m600 $(srcdir)/realms $(DESTDIR)$(pkgsysconfdir)/realms"; \
+        $(INSTALL) -m600 $(srcdir)/realms $(DESTDIR)$(pkgsysconfdir)/realms; \
+        echo " $(INSTALL) -m600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers"; \
+        $(INSTALL) -m600 $(srcdir)/servers $(DESTDIR)$(pkgsysconfdir)/servers
 
 uninstall-local:
-	rm -f $(pkgsysconfdir)/realms
-	rm -f $(pkgsysconfdir)/servers
+	rm -f $(DESTDIR)$(pkgsysconfdir)/realms
+	rm -f $(DESTDIR)$(pkgsysconfdir)/servers
--- ppp-2.4.2/pppd/plugins/radius/Makefile.linux.vns	2002-11-09 14:24:42 +0300
+++ ppp-2.4.2/pppd/plugins/radius/Makefile.linux	2004-05-28 11:56:52 +0400
@@ -3,9 +3,8 @@
 # Copyright 2002 Roaring Penguin Software Inc.
 #
 
-MANDIR=/usr/man
 PLUGIN=radius.so radattr.so radrealms.so
-CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2
+CFLAGS = $(RPM_OPT_FLAGS) -I../.. -I../../../include -Iradiusclient/include
 
 # Uncomment the next line to include support for Microsoft's
 # MS-CHAP authentication protocol.
@@ -29,15 +28,15 @@
 
 install: all
 	$(MAKE) $(MFLAGS) -C radiusclient install
-	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radius.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radattr.so $(LIBDIR)
-	$(INSTALL) -s -c -m 755 radrealms.so $(LIBDIR)
-	$(INSTALL) -c -m 444 pppd-radius.8 $(MANDIR)/man8
-	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)/man8
+	mkdir -p $(LIBDIR) $(MANDIR)/man8
+	$(INSTALL) -m 755 radius.so $(LIBDIR)/
+	$(INSTALL) -m 755 radattr.so $(LIBDIR)/
+	$(INSTALL) -m 755 radrealms.so $(LIBDIR)/
+	$(INSTALL) -m 644 pppd-radius.8 $(MANDIR)/man8/
+	$(INSTALL) -m 644 pppd-radattr.8 $(MANDIR)/man8/
 
-radius.so: radiusclient/lib/.libs/libradiusclient.a radius.o
-	gcc -o radius.so -shared radius.o radiusclient/lib/.libs/libradiusclient.a
+radius.so: radiusclient/lib/.libs/libradiusclient.so radius.o
+	gcc -o radius.so -shared radius.o -L./radiusclient/lib/.libs -lradiusclient
 
 radattr.so: radattr.o
 	gcc -o radattr.so -shared radattr.o
@@ -54,7 +53,7 @@
 radrealms.o: radrealms.c
 	gcc $(CFLAGS) -c -o radrealms.o -fPIC radrealms.c
 
-radiusclient/lib/.libs/libradiusclient.a:
+radiusclient/lib/.libs/libradiusclient.so:
 	test -r radiusclient/Makefile ||           \
 		(cd radiusclient;                  \
 		 ./configure --prefix=/usr         \
--- ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux.vns	2004-01-13 06:57:55 +0300
+++ ppp-2.4.2/pppd/plugins/rp-pppoe/Makefile.linux	2004-05-28 12:01:51 +0400
@@ -16,16 +16,15 @@
 # Version is set ONLY IN THE MAKEFILE!  Don't delete this!
 VERSION=3.3
 
-COPTS=-O2 -g
-CFLAGS=$(COPTS) -I../../../include/linux
+CFLAGS += $(RPM_OPT_FLAGS) -I../../../include/linux
 all: rp-pppoe.so
 
 rp-pppoe.so: libplugin.a plugin.o
 	gcc -o rp-pppoe.so -shared plugin.o libplugin.a
 
 install: all
-	$(INSTALL) -d -m 755 $(LIBDIR)
-	$(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
+	mkdir -p $(LIBDIR)
+	$(INSTALL) -m 755 rp-pppoe.so $(LIBDIR)/
 
 clean:
 	rm -f *.o *.so
--- ppp-2.4.2/pppd/plugins/Makefile.linux.vns	2004-01-13 06:56:24 +0300
+++ ppp-2.4.2/pppd/plugins/Makefile.linux	2004-05-28 11:59:44 +0400
@@ -1,8 +1,7 @@
 CC	= gcc
-COPTS	= -O2 -g
-CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
+CFLAGS	= $(RPM_OPT_FLAGS) -I.. -I../../include -fPIC
 LDFLAGS	= -shared
-INSTALL	= install -o root
+INSTALL	= install
 
 SUBDIRS := rp-pppoe
 # Uncomment the next line to include the radius authentication plugin
@@ -24,10 +23,10 @@
 LIBDIR	= $(DESTDIR)/usr/lib/pppd/$(VERSION)
 
 install: $(PLUGINS)
-	$(INSTALL) -d $(LIBDIR)
+	mkdir -p $(LIBDIR)
 	$(INSTALL) $? $(LIBDIR)
-	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d INSTALL=$(INSTALL) \
-				LIBDIR=$(LIBDIR) install; done
+	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d INSTALL='$(INSTALL)' \
+				LIBDIR='$(LIBDIR)' install; done
 
 clean:
 	rm -f *.o *.so *.a
--- ppp-2.4.2/pppd/Makefile.linux.vns	2003-11-28 00:55:19 +0300
+++ ppp-2.4.2/pppd/Makefile.linux	2004-05-28 11:56:52 +0400
@@ -5,7 +5,7 @@
 
 # Default installation locations
 BINDIR = $(DESTDIR)/usr/sbin
-MANDIR = $(DESTDIR)/usr/man
+MANDIR = $(DESTDIR)/usr/share/man
 INCDIR = $(DESTDIR)/usr/include
 
 TARGETS = pppd
@@ -29,10 +29,10 @@
 include .depend
 endif
 
-# CC = gcc
+CC = gcc
 #
-COPTS = -O2 -pipe -Wall -g
-LIBS =
+COPTS = -Wall $(RPM_OPT_FLAGS)
+LIBS = -lutil
 
 # Uncomment the next 2 lines to include support for Microsoft's
 # MS-CHAP authentication protocol.  Also, edit plugins/radius/Makefile.linux.
@@ -60,7 +60,7 @@
 USE_TDB=y
 
 HAS_SHADOW=y
-#USE_PAM=y
+USE_PAM=y
 #HAVE_INET6=y
 
 # Enable plugins
@@ -98,7 +98,7 @@
 CFLAGS	+= -DUSE_SRP -DOPENSSL -I/usr/local/ssl/include
 LIBS	+= -lsrp -L/usr/local/ssl/lib -lcrypto
 TARGETS	+= srp-entry
-EXTRAINSTALL = $(INSTALL) -s -c -m 555 srp-entry $(BINDIR)/srp-entry
+EXTRAINSTALL = $(INSTALL) -m 755 srp-entry $(BINDIR)/
 MANPAGES += srp-entry.8
 EXTRACLEAN += srp-entry.o
 NEEDDES=y
@@ -119,7 +119,7 @@
 ifneq ($(wildcard /usr/include/crypt.h),)
 CFLAGS   += -DHAVE_CRYPT_H=1
 endif
-ifneq ($(wildcard /usr/lib/libcrypt.*),)
+ifneq ($(wildcard /usr/lib/libcrypt.so),)
 LIBS	+= -lcrypt
 endif
 
@@ -136,7 +136,7 @@
 # For "Pluggable Authentication Modules", see ftp.redhat.com:/pub/pam/.
 ifdef USE_PAM
 CFLAGS   += -DUSE_PAM
-LIBS     += -lpam -ldl
+LIBS     += -lpam
 endif
 
 # Multi-linnk
@@ -192,17 +192,15 @@
      CFLAGS += -DMAXOCTETS
 endif
 
-INSTALL= install -o root
+INSTALL = install
 
 all: $(TARGETS)
 
 install: pppd
 	mkdir -p $(BINDIR) $(MANDIR)
 	$(EXTRAINSTALL)
-	$(INSTALL) -s -c -m 555 pppd $(BINDIR)/pppd
-	if chgrp pppusers $(BINDIR)/pppd 2>/dev/null; then \
-	  chmod o-rx,u+s $(BINDIR)/pppd; fi
-	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)/man8
+	$(INSTALL) -m 755 pppd $(BINDIR)/pppd
+	$(INSTALL) -m 644 pppd.8 $(MANDIR)/man8/
 
 pppd: $(PPPDOBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
@@ -212,7 +210,7 @@
 
 install-devel:
 	mkdir -p $(INCDIR)/pppd
-	$(INSTALL) -c -m 644 $(HEADERS) $(INCDIR)/pppd
+	$(INSTALL) -m 644 $(HEADERS) $(INCDIR)/pppd/
 
 clean:
 	rm -f $(PPPDOBJS) $(EXTRACLEAN) $(TARGETS) *~ #* core
--- ppp-2.4.2/pppdump/Makefile.linux.vns	1999-07-26 15:09:29 +0400
+++ ppp-2.4.2/pppdump/Makefile.linux	2004-05-28 11:56:52 +0400
@@ -1,7 +1,7 @@
-CFLAGS= -O -I../include/net
+CFLAGS= $(RPM_OPT_FLAGS) -I../include/net
 OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
 
-INSTALL= install
+INSTALL = install
 
 all:	pppdump
 
@@ -13,5 +13,5 @@
 
 install:
 	mkdir -p $(BINDIR) $(MANDIR)/man8
-	$(INSTALL) -s -c pppdump $(BINDIR)
-	$(INSTALL) -c -m 444 pppdump.8 $(MANDIR)/man8
+	$(INSTALL) -m 755 pppdump $(BINDIR)/
+	$(INSTALL) -m 644 pppdump.8 $(MANDIR)/man8/
--- ppp-2.4.2/pppstats/Makefile.linux.vns	2002-11-09 14:24:43 +0300
+++ ppp-2.4.2/pppstats/Makefile.linux	2004-05-28 11:56:52 +0400
@@ -6,21 +6,21 @@
 PPPSTATSRCS = pppstats.c
 PPPSTATOBJS = pppstats.o
 
-#CC = gcc
-COPTS = -O
+CC = gcc
+COPTS = $(RPM_OPT_FLAGS)
 COMPILE_FLAGS = -I../include
 LIBS =
 
-INSTALL= install -o root -g daemon
+INSTALL = install
 
 CFLAGS = $(COPTS) $(COMPILE_FLAGS)
 
 all: pppstats
 
 install: pppstats
-	-mkdir -p $(MANDIR)/man8
-	$(INSTALL) -s -c pppstats $(BINDIR)/pppstats
-	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)/man8/pppstats.8
+	mkdir -p $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) -s -c pppstats $(BINDIR)/
+	$(INSTALL) -c -m 644 pppstats.8 $(MANDIR)/man8/
 
 pppstats: $(PPPSTATSRCS)
 	$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)