--- Makefile.orig	1993-02-10 06:12:59 UTC
+++ Makefile
@@ -16,6 +16,7 @@
 ####
 #### For Macs with A/UX, use:	SYS= -D_SYS_AUX
 #### For DECStations, use:	SYS= -D_SYS_ULTRIX
+#### For modern BSD systems (added for FreeBSD 6.3 port) use:	SYS= -D_SYS_BSD
 #### For PC's with WATCOM C/386 use the special Makefile instead,
 #### No other ports are built in yet. Please do them, and tell us how!
 #### Refer to lib/system.h and lib/syscode.c for ideas.
@@ -24,7 +25,7 @@
 #### datasets (roughly 5000 loci vs 1000 loci). For even bigger datasets, 
 #### modify mapm/mapm.h.
 
-SYS= -D_SYS_SUNOS
+SYS= -D_SYS_BSD -D_BIG_DATASETS
 
 #### Next define the system libraries to link with Mapmaker. On SunOS, Ultrix
 #### and other vanilla-ish BSD systems, the correct setting is:
@@ -70,9 +71,11 @@ DIR= /usr/local/bin
 #### (see the end of readline/readline.c). Readline will not compile on
 #### A/UX without using GCC instead of A/UX's cc (because it needs alloca).
 
-OUR_LIB= gnu.o
-GNU_OPT= -D_GNU_READLINE -I.
-GNU_LIBS= -L$(RDLN) -lreadline
+#OUR_LIB= gnu.o
+#GNU_OPT= -D_GNU_READLINE -I.
+OUR_LIB= lib.o
+GNU_OPT= 
+#GNU_LIBS= -L$(RDLN) -lreadline
 
 #### Now we specify the commands used to compile MAPMAKER.  The stuff
 #### below works on Sun SPARCStations running SunOS 4.1.x (aka Solaris 1.x)
@@ -82,8 +85,8 @@ GNU_LIBS= -L$(RDLN) -lreadline
 #### person at your site should be able to figure out what to do almost
 #### trivially. See the file INSTALL.ME for details. 
 
-COMPILE= cc
-LINKALL= cc
+COMPILE= ${CC} ${CFLAGS}
+LINKALL= ${CC}
 LINKLIB= ld -r
 DELETE=  rm -f
 INSTALL= cp
