--- code/hardware/sound/Makefile.old	2009-07-18 13:47:05.000000000 -0700
+++ code/hardware/sound/Makefile	2009-07-18 13:47:13.000000000 -0700
@@ -52,8 +52,8 @@
 #
 ########################################################
 
-LIBDIR = -L/usr/local/lib -L/opt/local/lib -L/sw/lib
-INCLUDEDIR = -I/usr/local/include -I/opt/local/include -I/sw/include
+LIBDIR = -L@@PREFIX@@/lib
+INCLUDEDIR = -I@@PREFIX@@/include
 
 INCLUDEPY=$(shell python -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('INCLUDEPY')")
 LIBPY=$(shell python -c "import distutils.sysconfig;print distutils.sysconfig.get_config_var('LIBPL')")
@@ -83,7 +83,7 @@
 
 _soundFile.so: soundFile.i soundFile.o
 	swig -c++ -python soundFile.i		
-	g++ -Wno-long-double -c soundFile_wrap.cxx -DHAVE_CONFIG_H -I$(PYTHON_INC)
+	g++ -c soundFile_wrap.cxx -DHAVE_CONFIG_H -I$(PYTHON_INC) $(INCLUDEDIR)
 	g++ -bundle -undefined suppress -flat_namespace soundFile_wrap.o soundFile.o -lsndfile -lsamplerate -o _soundFile.so $(LIBDIR) $(INCLUDEDIR)
 
 test_epl: eplSound.o RtAudio.o test_epl.cpp
