--- src/Makefile.orig	2005-06-23 01:29:38.000000000 -0400
+++ src/Makefile	2005-06-23 01:32:21.000000000 -0400
@@ -1,16 +1,18 @@
 SOUND ?= 0
 DEBUG ?= 0
 
-CPP = g++ $(CPPFLAGS) $(INCLUDES) $(DEFINES)
-CPPFLAGS = -g -Wall -O
-DEFINES = -DDATA_DIR='""' -DUNIX=1 -DSOUND=$(SOUND) -DDEBUG=$(DEBUG)
+CPP = $(CXX) $(CPPFLAGS) $(INCLUDES) $(DEFINES)
+DEFINES = -DDATA_DIR='"$(GAMES_DATADIR)/$(PN)/"' -DUNIX=1 -DSOUND=$(SOUND) -DDEBUG=$(DEBUG)
 INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/GL -I../libs
 LIBPATHS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib -L../libs
 LIBRARIES = -pthread -lglfw -lGL -lX11 -lXxf86vm -lGLU -lXext
+ifneq ($(SOUND),0)
+LIBRARIES += -lfmod
+endif
 OBJECTS = doalloc.o doberon.o dobuildings.o docomputer.o doconfig.o dodata.o dodepend.o dodraw.o doengine.o doevents.o dofactories.o dofight.o dofile.o dofollower.o doforces.o dohost.o doipc.o dolayout.o doleader.o dologs.o domap.o domapunits.o domouse.o donet.o doperceptron.o doplayers.o doraces.o doschemes.o doselection.o dosimpletypes.o dosound.o dosources.o dounits.o dowalk.o doworkers.o glfont.o glgui.o tga.o utils.o
 TARGETS = ../doberon
 
-all: tags ../doberon checking
+all: ../doberon
 
 checking: .checking
 .checking: *.h *.cpp