--- source/linux/makefile.orig	Thu Jan 22 17:22:08 2004
+++ source/linux/makefile	Thu Jan 22 17:40:13 2004
@@ -1,7 +1,7 @@
 
 # Comment out the two lines shown below to disable sound
-MIKMOD_LIBS = `libmikmod-config --cflags` `libmikmod-config --libs`
-METHANE_FLAGS = -DMETHANE_MIKMOD
+MIKMOD_LIBS = `libmikmod-config --libs`
+METHANE_FLAGS = -DMETHANE_MIKMOD -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 
 all: message methane
 
@@ -22,7 +22,7 @@
 	MainSource/misc.o MainSource/objlist.o MainSource/player.o MainSource/power.o MainSource/target.o \
 	MainSource/suck.o MainSource/weapon.o MainSource/sound.o MainData/snddata.o MainData/gfxdata.o MainData/gfxdata2.o \
 	MainData/gfxdata3.o MainData/mapdata.o MainLinux/font32.o MainLinux/doc.o MainLinux/main.o MainMikMod/audiodrv.o \
-	-o methane -lclanCore -lclanApp -lclanDisplay ${MIKMOD_LIBS}
+	-o methane -L${LOCALBASE}/lib -lclanCore -lclanApp -lclanDisplay ${MIKMOD_LIBS} ${PTHREAD_LIBS}
 
 clean:
 	@rm -Rf MainSource
@@ -38,23 +38,23 @@
 MainSource/%.o : ../%.cpp
 	@echo "  Compiling $<..."
 	@if [ ! -d MainSource ]; then mkdir MainSource; fi
-	gcc ${CXXFLAGS} ${METHANE_FLAGS} -I ../linux `libmikmod-config --cflags` -c $< -o $@
+	${CXX} ${CXXFLAGS} ${METHANE_FLAGS} -I ../linux `libmikmod-config --cflags` -c $< -o $@
 
 # The main data
 MainData/%.o : ../data/%.cpp
 	@echo "  Compiling $<..."
 	@if [ ! -d MainData ]; then mkdir MainData; fi
-	gcc ${CXXFLAGS} ${METHANE_FLAGS} -I ../ `libmikmod-config --cflags` -c $< -o $@
+	${CXX} ${CXXFLAGS} ${METHANE_FLAGS} -I ../ `libmikmod-config --cflags` -c $< -o $@
 
 # The linux source code
 MainLinux/%.o : ../linux/%.cpp
 	@echo "  Compiling $<..."
 	@if [ ! -d MainLinux ]; then mkdir MainLinux; fi
-	gcc ${CXXFLAGS} ${METHANE_FLAGS} -I ../ `libmikmod-config --cflags` -c $< -o $@
+	${CXX} ${CXXFLAGS} ${METHANE_FLAGS} -I ../ `libmikmod-config --cflags` -c $< -o $@
 
 # The sound driver source code
 MainMikMod/%.o : ../mikmod/%.cpp
 	@echo "  Compiling $<..."
 	@if [ ! -d MainMikMod ]; then mkdir MainMikMod; fi
-	gcc ${CXXFLAGS} ${METHANE_FLAGS} -I ../ `libmikmod-config --cflags` -c $< -o $@
+	${CXX} ${CXXFLAGS} ${METHANE_FLAGS} -I ../ `libmikmod-config --cflags` -c $< -o $@