--- src/Makefile.orig	Sun Mar 30 10:47:20 2003
+++ src/Makefile	Thu Apr 10 18:28:58 2003
@@ -61,8 +61,8 @@
 AWK = gawk
 CC = gcc
 DFLAGS = 
-HEADER_SEARCH_PATH =   -I/usr/X11R6/include -I/usr/local/include
-LIBRARY_SEARCH_PATH =   -L/usr/X11R6/lib -L/usr/local/lib
+HEADER_SEARCH_PATH =   -I${X11BASE}/include -I${prefix}/include
+LIBRARY_SEARCH_PATH =   -L${X11BASE}/lib -L${prefix}/lib
 LIBS = 
 LN_S = ln -s
 MAKEINFO = makeinfo
@@ -70,24 +70,24 @@
 PACKAGE = wmapmload
 SETGID_FLAGS = 
 VERSION = 0.3.2
-XCFLAGS =  -I/usr/X11R6/include
-XLFLAGS =  -L/usr/X11R6/lib
+XCFLAGS =  -I${X11BASE}/include
+XLFLAGS =  -L${X11BASE}/lib
 XLIBS = -lX11  -lXext -lXpm
 X_EXTRA_LIBS = 
-X_LIBRARY_PATH = /usr/X11R6/lib
+X_LIBRARY_PATH = ${X11BASE}/lib
 
 bin_PROGRAMS = WMxmms
 
 WMxmms_SOURCES =  	wmxmms.c 	dockapp.c 	dockapp.h 	mouse_regions.c 	mouse_regions.h 	backdrop_off.xpm 	backdrop_on.xpm 	parts.xpm 	xmms_func.c 	xmms_func.h
 
 
-CPPFLAGS =   `/usr/bin/xmms-config --cflags` -DDATA_DIR=\"`/usr/bin/xmms-config --data-dir`\"
+CPPFLAGS =   `${PREFIX}/bin/xmms-config --cflags` -DDATA_DIR=\"`${PREFIX}/bin/xmms-config --data-dir`\"
 
-INCLUDES =   -I/usr/X11R6/include -I/usr/local/include
+INCLUDES =   -I${X11BASE}/include -I${prefix}/include
 
-WMxmms_LDADD =   -L/usr/X11R6/lib -L/usr/local/lib -lX11  -lXext -lXpm
+WMxmms_LDADD =   -L${X11BASE}/lib -L${prefix}/lib -lX11  -lXext -lXpm
 
-LDFLAGS = `/usr/bin/gtk-config --libs` `/usr/bin/xmms-config --libs`
+LDFLAGS = `${PREFIX}/bin/gtk12-config --libs` `${PREFIX}/bin/xmms-config --libs`
 
 INSTALL_PROGRAM =  	${INSTALL} 	 	$(AM_INSTALL_PROGRAM_FLAGS)
 
@@ -98,13 +98,12 @@
 
 
 DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
-X_CFLAGS =  -I/usr/X11R6/include
-X_LIBS =  -L/usr/X11R6/lib
+X_CFLAGS =  -I${X11BASE}/include
+X_LIBS =  -L${X11BASE}/lib
 X_PRE_LIBS =  -lSM -lICE
 WMxmms_OBJECTS =  wmxmms.o dockapp.o mouse_regions.o xmms_func.o
 WMxmms_DEPENDENCIES = 
 WMxmms_LDFLAGS = 
-CFLAGS = -g -O2
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@