--- ../innfeed/Makefile	Fri Jul 25 08:26:07 1997
+++ ./Makefile	Fri May 29 23:12:09 1998
@@ -9,7 +9,7 @@
 # 
 
 # Where the programs get installed.
-BINDIR		= /usr/news/local
+BINDIR		= /usr/news/bin
 
 # Where your man pages live.
 MANDIR		= /usr/local/man
@@ -19,14 +19,14 @@
 CC		= gcc
 
 # How to run lex and yacc. Innfeed requires Flex (but you shouldn't need it).
-LEX		= lex -d
+LEX		= flex -d
 YACC		= yacc -t -d
 
 # Debug option for compiler -g or -O (or both if using gcc).
 DBFLAGS		= -g 
 
 # Add any architecture specific defines, flags etc. you need
-OSFLAGS		=
+OSFLAGS		= -Dsun
 # OSFLAGS	= -DSOLARIS			# uncomment for Solaris
 
 # Any extra non-architecture specific defines you may need.
@@ -40,9 +40,10 @@
 LIBRARIES	=
 # uncomment for SOLARIS but you may have to leave out the -lresolv
 # LIBRARIES	= -lnsl -lsocket -lresolv	
+LIBRARIES	= -lstdc++
 
 ## Add any `-L' flags here
-LDFLAGS		= 
+LDFLAGS		= -L/usr/local/lib
 
 ## Add any local includes '-I' needed here. (e.g. if using -DUSE_INN_INCLUDES)
 # INCDIRS	= -I/usr/local/src/inn-1.4/include
@@ -55,7 +56,7 @@
 
 # Uncomment the next line if you don't have a inet_aton() in your
 # libraries (Solaris is one such OS).
-# EXTRA_SRC	= inet_addr.c
+EXTRA_SRC	= inet_addr.c
 
 # Any extra compiler flags for warning generation.
 WARNINGS	=
@@ -183,7 +184,7 @@
 innfeed: $(OBJS) version.o $(MALLOC)
 	$(LINK.c) -o $@ $(OBJS) version.o $(MALLOC) $(LOADLIBES)
 
-SAVEOLD		= rm -f $@.orig ; mv $@ $@.orig
+SAVEOLD		= rm -f $@.orig ; mv $@ $@.orig || echo 1
 COPYFILE	= $(INSTALL) $? $@
 
 $(INNFEED_BIN): innfeed