--- Makefile.orig	Mon May  1 22:56:45 2000
+++ Makefile	Fri Aug 30 01:43:32 2002
@@ -1,19 +1,19 @@
 # Makefile for Linux Heretic/GLHeretic
 
 # Comment the line below if you don't want to build GLHeretic.
-WANT_OGL = yes
+#WANT_OGL = yes
 
 # Comment this if you don't want to build GLHeretic 
 # with highest quality options.
 # (Only if you have WANT_OGL !)
-WANT_NICE_OGL = yes
+#WANT_NICE_OGL = yes
 
 
 # Uncomment the line below if you want to use GSI for sound.
 # (doesn't really work yet. :-()
 #WANT_GSI = yes
 
-CC = gcc -pipe
+#CC = gcc -pipe
 
 #
 # For old SVGALIB, comment out -D__NEWVGALIB__
@@ -21,7 +21,7 @@
 CDEFS.ipx = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \
 	-DIPX_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \
 	-D__NEWVGALIB__ # -DIPX_DEBUG -DEXTRA_WADS
-CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \
+CDEFS.udp = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DLINUX_MOUSE \
 	-DUDP_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \
 	-D__NEWVGALIB__ # -DEXTRA_WADS
 
@@ -38,7 +38,7 @@
 
 COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H
 
-COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__
+COPT.FreeBSD = -D__32BIT__ -DHOMEDIR='"\"${PREFIX}/share/heretic\""'
 
 COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \
            -DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\)
@@ -57,12 +57,12 @@
 endif
 
 # Change this to change the platform
-COPT.arch = $(COPT.x86)
+COPT.arch = $(COPT.FreeBSD)
 
 # If you want IPX-netcode compiled, replace $(CDEFS.udp) with $(CDEFS.ipx)
 
-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \
-	 -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl)
+CFLAGS += $(CDEFS.udp) $(COPT.arch) \
+	 -I. -I.. -I${X11BASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl)
 
 # Uncomment the line below if you want to use original "[" and "]" keys
 # for inventory access, instead of "k" and "l".
@@ -85,18 +85,18 @@
 COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND
 X11LIBS = -lXext -lX11
 
-MUSSERV = musserver
+#MUSSERV = musserver
 SNDSERV = sndserver
 
 endif
 
-X_LDFLAGS = -L/usr/X11R6/lib
+X_LDFLAGS = -L${X11BASE}/lib
 
 X11LIBS = -lXext -lX11
-GLLIBS  = -lSDL -lpthread
+GLLIBS  = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS}
 GGILIBS = -lggi -lm
 VGALIBS = -lvga
-SDLLIBS = -lSDL -lpthread 
+SDLLIBS = `${SDL_CONFIG} --libs` ${PTHREAD_LIBS}
 
 OBJS =	am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \
 	p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \
@@ -104,7 +104,7 @@
 	p_spec.o p_switch.o p_telept.o  p_tick.o p_user.o r_bsp.o r_data.o \
 	r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \
 	tables.o v_video.o w_wad.o z_zone.o in_lude.o \
-	info.o i_net.o i_system.o i_udp.o i_ipx.o i_main.o $(SOUND_OBJS)
+	info.o i_net.o i_system.o i_udp.o i_main.o $(SOUND_OBJS)
 
 GLOBJS = opengl/gl_effects.o opengl/gl_floorceil.o opengl/gl_fonts.o \
 	 opengl/gl_func.o opengl/gl_init.o opengl/gl_lights.o \