diff -urN Xfoil_orig/bin/Makefile Xfoil/bin/Makefile
--- Xfoil_orig/bin/Makefile     2005-11-23 08:55:45.000000000 -0500
+++ Xfoil/bin/Makefile  2005-12-22 09:42:53.000000000 -0500
@@ -91,26 +91,26 @@
 #FFLOPT = -O2 -fomit-frame-pointer
 ##--------------------------
 ### GNU g77
-#FC = g77
-#FFLAGS = -O3 -fomit-frame-pointer
-#FFLOPT = -O3 -fomit-frame-pointer
+FC = g77
+FFLAGS = -O
+FFLOPT = -O
 # Debug flags (symbols, array bounds)
 #FC = g77
 #FFLAGS = -g -O0 -C
 ##--------------------------
 ### Intel Fortran Compiler
-FC = ifort
-FFLAGS = -O 
-FFLOPT = -O
+#FC = ifort
+#FFLAGS = -O 
+#FFLOPT = -O
 #FTNLIB = -Vaxlib /usr/lib/C-ctype.o /usr/lib/C_name.o /usr/lib/ctype-info.o
 #FTNLIB = -Vaxlib
-FTNLIB = -i_dynamic
+#FTNLIB = -i_dynamic
 
 ##--------------------------
 ### Double precision option
-FFLAGS = -O -r8 
-FFLOPT = -O -r8 
-PLTOBJ = ../plotlib/libPltDP.a 
+#FFLAGS = -O -r8 
+#FFLOPT = -O -r8 
+#PLTOBJ = ../plotlib/libPltDP.a 
 
 
 all:    $(PROGS)
diff -urN Xfoil_orig/orrs/bin/Makefile Xfoil/orrs/bin/Makefile
--- Xfoil_orig/orrs/bin/Makefile        2005-03-04 20:16:18.000000000 -0500
+++ Xfoil/orrs/bin/Makefile     2005-12-22 11:19:50.000000000 -0500
@@ -1,20 +1,20 @@
 
 SRC = ../src
-PLTOBJ = /var/local/codes/Xplot/libPlt.a
+PLTOBJ = ../../plotlib/libPlt.a 
 
 #========================================
 #  Default compiler flags
-FC = f77
-FLG = -O
-PLTLIB = -lX11
+FC = g77
+FLG = -O
+PLTLIB = -L/usr/X11R6/lib -lX11
 FTNLIB =
 
 #========================================
 #  Uncomment for Intel Fortran Compiler
-FC = ifort
-FLG = -O
-PLTLIB = -L/usr/X11R6/lib -lX11
-FTNLIB = -Vaxlib
+#FC = ifort
+#FLG = -O
+#PLTLIB = -L/usr/X11R6/lib -lX11
+#FTNLIB = -Vaxlib
 
 #  Additional IFC stuff needed on MIT's Athena system
 #FC = ifc
diff -urN Xfoil_orig/orrs/src/osmap.f Xfoil/orrs/src/osmap.f
--- Xfoil_orig/orrs/src/osmap.f 2004-11-01 23:10:45.000000000 -0500
+++ Xfoil/orrs/src/osmap.f      2005-12-22 11:51:05.000000000 -0500
@@ -98,7 +98,8 @@
 C
 C---- set OSFILE to match the absolute OS database filename
       CHARACTER*128 OSFILE
-      DATA OSFILE / '/var/local/codes/orrs/osmap.dat' /
+      DATA OSFILE 
+     &/'@BUILDPREFIX@/orrs/osmap.dat'/
 c
 c      DATA OSFILE
 c     &/'/afs/athena.mit.edu/course/16/16_d0006/Codes/orrs/osmap_lx.dat'/
diff -urN Xfoil_orig/plotlib/Makefile Xfoil/plotlib/Makefile
--- Xfoil_orig/plotlib/Makefile 2004-06-02 12:23:43.000000000 -0400
+++ Xfoil/plotlib/Makefile      2005-12-22 09:45:36.000000000 -0500
@@ -69,14 +69,14 @@
 
 ###================================================
 ###  Default compilers and flags, install commands
-FC = f77
-CC  = cc
+FC = g77
+CC  = gcc
 # Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
 DEFINE = -DUNDERSCORE
 # Uncomment DP to make double-precision version
 #DP = -r8
-FFLAGS  = -O $(DP)
-CFLAGS  = -O $(DEFINE)
+FFLAGS  = -O
+CFLAGS  = -O2 -I/usr/X11R6/include/ $(DEFINE)
 AR = ar r 
 RANLIB = ranlib
 LINKLIB =  -lX11 
diff -urN Xfoil_orig/plotlib/config.make Xfoil/plotlib/config.make
--- Xfoil_orig/plotlib/config.make      2005-10-21 23:04:44.000000000 -0400
+++ Xfoil/plotlib/config.make   2005-12-22 09:49:18.000000000 -0500
@@ -8,8 +8,8 @@
 
 ### Use these to set library name 
 ### (you might add DP to name to keep double precision version separate)
-#PLTLIB = libPlt.a
-PLTLIB = libPltDP.a
+PLTLIB = libPlt.a
+#PLTLIB = libPltDP.a
 
 
 # Some fortrans need trailing underscores in C interface symbols (see Xwin.c)
@@ -55,13 +55,13 @@
 CC  = gcc
  
 # Uncomment to make double-precision version
-DP = -r8
-FFLAGS  = -O3 $(DP)
-CFLAGS  = -O3 $(DEFINE)
-AR = ar r
-RANLIB = ranlib 
+#DP = -r8
+#FFLAGS  = -O3 $(DP)
+#CFLAGS  = -O3 $(DEFINE)
+#AR = ar r
+#RANLIB = ranlib 
 
-LINKLIB = -L/usr/X11R6/lib -lX11
+#LINKLIB = -L/usr/X11R6/lib -lX11
 
 
 ###-------------------------------------------------------------------------
@@ -127,3 +127,13 @@
 #RANLIB = ar qs
 #LINKLIB =  -lX11
 
+###-------------------------------------------------------------------------
+###  OS X via Fink packaging system
+#
+FC = g77
+FFLAGS  = -O
+CFLAGS  = -O2 -I/usr/X11R6/include/ $(DEFINE)
+AR = ar r
+RANLIB = ranlib 
+
+LINKLIB = -L/usr/X11R6/lib -lX11