--- lib/mk/system.mk.orig	Thu Nov 12 14:33:01 1998
+++ lib/mk/system.mk	Thu Nov 12 14:56:51 1998
@@ -20,9 +20,9 @@
 .EXPORT: SAME
 #endif .MACHINE
 
-#ifdef .MACHINE
-#include <sys-$(.MACHINE:S@/@-@g).mk>
-#endif
+##ifdef .MACHINE
+##include <sys-$(.MACHINE:S@/@-@g).mk>
+##endif
 
 
 .SUFFIXES : .out .a .ln .o .c .cc .F .f .e .r .y .l .s .cl .p .h .i \
@@ -45,39 +45,40 @@
 
 # Use absolute paths whenever possible. This greatly reduces server load
 # once pmake has created parallel jobs all over the network ...
-YACC	?= /usr/bin/yacc
-YFLAGS	?=
-LEX	?= /usr/bin/lex
+YACC	?= yacc
+YFLAGS	?= -d
+LEX	?= lex
 LFLAGS	?=
-CC	?= /bin/cc
-CXX	?= CC
-RM	?= /bin/rm -f
-MV	?= /bin/mv
-AS	?= /bin/as
-PC	?= /usr/ucb/pc
+CC	?= cc
+CXX	?= c++
+RM	?= rm -f
+MV	?= mv
+AS	?= as
+PC	?= pc
 PFLAGS	?=
-CFLAGS	?=
-CXXFLAGS?=
+CFLAGS	?= -O -pipe
+CXXFLAGS?= $(CFLAGS)
 AFLAGS	?=
-RC	?= /usr/bin/f77
+RC	?= f77
 RFLAGS	?=
-FC	?= /usr/bin/f77
+FC	?= f77
 EFLAGS	?=
-FFLAGS	?=
+FFLAGS	?= -O
 LOADLIBES ?=
 CO	?= co
 COFLAGS	?=
 CI	?= ci
 CIFLAGS	?=
-AR	?= /bin/ar
-ARFLAGS	?= r
+AR	?= ar
+ARFLAGS	?= -rv
 #ifdef SYSV
 RANLIB	?= /bin/true
 #else
 RANLIB	?= ranlib
 #endif
-LD	?= /bin/ld
-LINT	?= /usr/bin/lint
+LD	?= ld
+LINT	?= lint
+LINTFLAGS ?= -chapbx
 MKDEP	?= makedepend
 
 .c,v.c .y,v.y .l,v.l .s,v.s .h,v.h :