--- Makefile.orig	2001-08-13 01:41:14.000000000 +0200
+++ Makefile	2002-07-17 00:35:58.000000000 +0200
@@ -1,5 +1,8 @@
 GTK_CFLAGS=	$(shell gtk-config --cflags)
 
+BINDIR=/usr/bin
+DESTDIR=
+
 XMMS_PLUGIN=	libcrystality.so
 XMMS_CFLAGS=	$(shell xmms-config --cflags)
 XMMS_PLUGINDIR=	$(shell xmms-config --effect-plugin-dir)
@@ -7,21 +10,21 @@
 STDIO_PLUGIN=	crystality-stdio
 STDIO_LIBS=	-lpthread $(shell gtk-config --libs)
 
-CFLAGS= -s -mpentium -O6 -Wall -ffast-math -fomit-frame-pointer -finline-functions -fexpensive-optimizations $(GTK_CFLAGS)
-
+CFLAGS= -s -O2 $(AM_CFLAGS) -Wall -ffast-math -fomit-frame-pointer -finline-functions -fexpensive-optimizations
+CC=cc
 
 TARGETS=	$(XMMS_PLUGIN) $(STDIO_PLUGIN)
 
 all	: $(TARGETS)
 
 $(STDIO_PLUGIN): crystality.o gui.o stdio.o
-	cc $(CFLAGS) -o$(STDIO_PLUGIN) $(STDIO_LIBS) crystality.o gui.o stdio.o -lpthread
+	$(CC) $(CFLAGS) $(GTK_CFLAGS) -o$(STDIO_PLUGIN) $(STDIO_LIBS) crystality.o gui.o stdio.o -lpthread
 
 $(XMMS_PLUGIN): crystality.o gui.o xmms.o
-	cc $(CFLAGS) -o$(XMMS_PLUGIN) -shared -fPIC crystality.o gui.o xmms.o
+	$(CC) $(CFLAGS) $(GTK_CFLAGS) -o$(XMMS_PLUGIN) -shared -fPIC crystality.o gui.o xmms.o
 
 .c.o	:
-	cc $(CFLAGS) -c $<
+	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c $<
 
 clean	: 
 	rm -f $(TARGETS) core *\.o
@@ -35,30 +38,10 @@
 	  echo "No Crystality binaries found, do \"make\" before\!";\
 	  exit 1;\
 	fi ;\
-	if [ -d /usr/local/bin ] ; then \
-	  cp $(STDIO_PLUGIN) /usr/local/bin ;\
-	elif [ -d /usr/bin ] ; then \
-	  cp $(STDIO_PLUGIN) /usr/bin; \
-        else \
-	  echo -e "\n\n**********************************************************" ;\
-	  echo        "           INSTALLATION OF STDIO PLUGIN FAILED" ;\
-	  echo        "  Cannot copy plugin into any of standard bin directories";\
-	  echo        "             Copy $(STDIO_PLUGIN) manually" ;\
-	  echo        "              into your binaries directory." ;\
-	  echo        "**********************************************************" ;\
-        fi ;\
-	if [ -d $(XMMSPLUGINDIR) ] ; then \
-	  cp $(XMMS_PLUGIN) $(XMMS_PLUGINDIR) ;\
-	else \
-	  echo -e "\n\n**********************************************************" ;\
-	  echo        "           INSTALLATION OF XMMS PLUGIN FAILED" ;\
-	  echo        "XMMS not installed on installed in not standard directory." ;\
-	  echo        "        Copy library \"$(XMMS_PLUGIN)\" manually" ;\
-	  echo        "               into XMMS's Effect directory." ;\
-	  echo        "**********************************************************" ;\
-	  exit 2 ;\
-	fi ;\
-	echo -e "\n\nCrystality Plugin v0.92 installed succesfully!" ;
+	mkdir -p $(DESTDIR)$(BINDIR)
+	cp $(STDIO_PLUGIN) $(DESTDIR)$(BINDIR)
+	mkdir -p $(DESTDIR)$(XMMS_PLUGINDIR)
+	cp $(XMMS_PLUGIN) $(DESTDIR)$(XMMS_PLUGINDIR)
 tarball : $(TARGETS)
 	@rm *\.o
 	@cd ../ && tar -cf - crystality-plugin-0.92 | gzip > crystality-plugin-0.92.tar.gz

.