--- vars.mk.in.orig	Wed Aug 18 01:56:28 2004
+++ vars.mk.in	Tue Aug 31 12:58:54 2004
@@ -5,12 +5,11 @@
 PREFIX = @prefix@
 VPATH = ..:../players/xmms:../analyzer:../utils
 
-SHELL = bash
 XMMS_OBJ = @PLUGIN_OBJ@ interface.o libimmscore.a 
 
-CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ -Wall -fPIC -D_REENTRANT -I../
-CXXFLAGS = -fno-rtti
-LDFLAGS = `xmms-config --libs` @LIBS@
+CPPFLAGS = `xmms-config --cflags` @XCPPFLAGS@ @CPPFLAGS@ @CFLAGS@ -Wall -fPIC -D_REENTRANT -I../
+CXXFLAGS = ${CPPFLAGS}
+LDFLAGS = @LDFLAGS@ `xmms-config --libs` -lc -lm @LIBS@
 ARFLAGS = rs
 
 default: all