--- Makefile.orig	Tue Mar 26 14:15:51 2002
+++ Makefile	Tue Mar 26 14:20:29 2002
@@ -6,24 +6,26 @@
 
 BFLAGS		   = $(CXXFLAGS)
 
-BUILDFLAGS         = -Wall -lvorbis -lvorbisfile -logg `glib-config --cflags` `gtk-config --cflags` `gtk-config --libs` `glib-config --libs` -lm $(BFLAGS)
+BUILDFLAGS         = -L${LOCALBASE}/lib -lvorbis -lvorbisfile -logg `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` -lm $(BFLAGS)
 #comment out below to enable experimental gtk2 ui
 #BUILDFLAGS         = -Wall -lvorbis -lvorbisfile -logg `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0` -lm $(BFLAGS)
 
-BUILD2FLAGS	   = -Wall `glib-config --cflags` `gtk-config --cflags` `gtk-config --libs` `glib-config --libs` -lm $(BFLAGS)
+BUILD2FLAGS	   = `${GTK_CONFIG} --cflags` `${GTK_CONFIG} --libs` -lm $(BFLAGS)
 #comment out below to enable experimental gtk2 ui
 #BUILD2FLAGS        = -Wall `pkg-config --cflags gtk+-2.0` `pkg-config --libs gtk+-2.0` -lm $(BFLAGS)
 
 #To disable Vorbis support, comment out next line
-VORBIS		 = -DVORBIS
+ifdef WITH_VORBIS
+VORBIS		 = -DVORBIS -I${LOCALBASE}/include
+endif
 
 #To compile text only utility, comment out next line
 GTK		 = -DGTK
 
 
 #Text ui for win32 and *nix  (only built when GTK is commented out)
-TBUILDFLAGS	   = -Wall -lvorbis -lvorbisfile -lm $(BFLAGS)
-TBUILD2FLAGS	   = -Wall -lm $(BFLAGS)
+TBUILDFLAGS	   = -L${LOCALBASE}/lib -lvorbis -lvorbisfile -lm $(BFLAGS)
+TBUILD2FLAGS	   = -lm $(BFLAGS)
 
 #Win32 gtk build flags.  Uncomment these when building in win32  (only tested with gtk2)
 #prebuilt vorbis and ogg libs found at xiph.org do not seem to work when used with cygwin
@@ -38,6 +40,6 @@
 
 CPPFLAGS         = -Wall -DVERSION=\"$(VER)\" $(VORBIS) $(WIN32)
 
-CXX              = g++
+#CXX              = g++
 
 include Makefile.rules