--- Makefile.orig	Sun Mar  4 14:28:26 2007
+++ Makefile	Sun Mar  4 14:30:42 2007
@@ -1,22 +1,18 @@
 # Makefile for gxmms2 and gkrellxmms2
 
 # Installation directory
-PREFIX=/usr/local
-KRELLPREFIX=/usr
 
 ALLFILES=gkrellxmms2/*.c gkrellxmms2/*.h gkrellxmms2/*.xpm gmedialib/*.c gmedialib/*.h gmedialib/*.xpm gtrackinfo/*.c gtrackinfo/*.h gxmms2src/*.c gxmms2src/*.h gxmms2src/*.xpm sdecode/*.c sdecode/*.h xmms2ctrl/*.c xmms2ctrl/*.h Makefile README COPYING CHANGELOG
 
-GTK_CFLAGS=$(shell pkg-config gtk+-2.0 --cflags)
-GTK_LIB=$(shell pkg-config gtk+-2.0 --libs)
-XMMS2_CFLAGS=$(shell pkg-config xmms2-client xmms2-client-glib --cflags)
-XMMS2_LIB=$(shell pkg-config xmms2-client xmms2-client-glib --libs)
+GTK_CFLAGS=`pkg-config gtk+-2.0 --cflags`
+GTK_LIB=`pkg-config gtk+-2.0 --libs`
+XMMS2_CFLAGS=`pkg-config xmms2-client xmms2-client-glib --cflags`
+XMMS2_LIB=`pkg-config xmms2-client xmms2-client-glib --libs`
 
-CFLAGS=-O2 -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I.
-LIBS=$(GTK_LIB) $(XMMS2_LIB)
+CFLAGS+=-O2 -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I.
+LIBS+=$(GTK_LIB) $(XMMS2_LIB)
 
 KRELLLFLAGS=-shared
-
-CC=gcc
 
 OBJS=gxmms2src/gxmms2.o xmms2ctrl/xmms2ctrl.o gtrackinfo/trackinfo.o gtrackinfo/gtrackinfo.o gmedialib/gmlplaylist.o gmedialib/gmedialib.o gmedialib/gmlbrowser.o gmedialib/gmlsearch.o gmedialib/gmlplaylists.o gmedialib/gmladdfiles.o sdecode/sdecode.o gxmms2src/wejpscroller.o gxmms2src/statusdisplay.o gxmms2src/wejpvolume.o gxmms2src/wejpconfig.o gxmms2src/eggtrayicon.o