--- Makefile.orig	Thu Feb 19 00:42:14 1998
+++ Makefile	Fri Aug 11 11:40:08 2000
@@ -1,17 +1,21 @@
 VERSION = 1.0.2
 VERSION_DEFINE = '-DPPTP_LINUX_VERSION="${VERSION}"'
 
-CC	= gcc -Wall
-DEBUG	= -g
+CC	= gcc
+DEBUG	=
 INCLUDE =
-CFLAGS  = -O9 $(VERSION_DEFINE) $(DEBUG) $(INCLUDE)
+CFLAGS  = -O $(VERSION_DEFINE) $(DEBUG) $(INCLUDE)
 LIBS	=
 LDFLAGS	=
+RM	= rm -f
+
+# This is the directory where pptp gets installed:
+PPTP_BINDIR	= ${PREFIX}/sbin
 
 #################################################################
 # CHANGE THIS LINE to point to the location of your pppd binary.
 
-CFLAGS += '-DPPPD_BINARY="/usr/sbin/pppd"'
+CFLAGS += '-DPPPD_BINARY="/usr/sbin/ppp"' -DUSER_PPP
 #################################################################
 
 PPTP_BIN = pptp
@@ -24,7 +28,7 @@
 CALLMGR_OBJS = pptp_callmgr.o pptp_ctrl.o dirutil.o util.o vector.o version.o
 CALLMGR_DEPS = pptp_callmgr.h pptp_ctrl.h dirutil.h pptp_msg.h vector.h
 
-all: $(PPTP_BIN) $(CALLMGR_BIN)
+all: $(PPTP_BIN)
 
 $(PPTP_BIN): $(PPTP_OBJS) $(PPTP_DEPS)
 	$(CC) -o $(PPTP_BIN) $(PPTP_OBJS) $(LDFLAGS) $(LIBS)
@@ -34,6 +38,10 @@
 
 vector_test: vector_test.o vector.o
 	$(CC) -o vector_test vector_test.o vector.o
+
+install: all
+	test -d $(PPTP_BINDIR) || mkdir -p $(PPTP_BINDIR)
+	install -c -s -o root -g wheel -m 755 $(PPTP_BIN) $(PPTP_BINDIR)
 
 clean:
 	$(RM) *.o *~