--- Makefile.orig	Tue Nov 24 05:52:13 1998
+++ Makefile	Sat Jul 24 23:04:14 1999
@@ -12,11 +12,11 @@
 ##############################################################################
 
 # For NEXTSTEP/OPENSTEP:
-CFLAGS = -Wall -O2 -traditional-cpp -g
+#CFLAGS = -Wall -O2 -traditional-cpp -g
 # put your architecture here:
-ARCH = -arch i386
-THE_CC = cc
-RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
+#ARCH = -arch i386
+#THE_CC = cc
+#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
 
 # For Linux: (use static linking because of libc5/libc6 troubles)
 #CFLAGS = -Wall -O2 -g
@@ -24,9 +24,9 @@
 #RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
 
 # For FreeBSD
-#CFLAGS = -Wall -O2
-#THE_CC = cc
-#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
+CFLAGS += -Wall
+THE_CC := $(CC)
+RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
 
 # For NetBsd
 #CFLAGS = -Wall -O2 -DNETBSD
@@ -66,7 +66,7 @@
 OFILES = proc.o sock.o rumba.o psinode.o kernel.o smb_abstraction.o fo_nfs.o
 
 .c.o:
-	$(CC) $(CFLAGS) $(ARCH) -c -o $*.o $<
+	$(CC) $(CFLAGS) -c -o $*.o $<
 
 all: $(NAME)
 
@@ -74,7 +74,7 @@
 	(cd nfs; $(MAKE) "CFLAGS=$(CFLAGS)" "CC=$(THE_CC)" "ARCH=$(ARCH)" "RPC_WARNFLAGS=$(RPC_WARNFLAGS)")
 
 $(NAME): $(OFILES) nfs_dir
-	$(CC) $(LDFLAGS) $(ARCH) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS)
+	$(CC) $(LDFLAGS) -o $(NAME) $(OFILES) nfs/nfs.o $(LIBS)
 
 clean:
 	rm -f $(OFILES)