--- Makefile	2004-03-16 22:01:09.000000000 +0000
+++ Makefile.new	2004-09-26 19:39:23.000309640 +0100
@@ -10,11 +10,11 @@
 # autodetect GNOME prefix, change this if you want it elsewhere
 PREFIX ?= `pkg-config libgnome-2.0 --variable=prefix || echo /usr`
 
-LIBDIR = $(PREFIX)/lib/blogtk
-BINDIR = $(PREFIX)/bin
-DATADIR = $(PREFIX)/share/blogtk
-APPLICATIONSDIR = $(PREFIX)/share/applications
-ICONDIR = $(PREFIX)/share/pixmaps
+LIBDIR = $(DESTDIR)$(PREFIX)/lib/blogtk
+BINDIR = $(DESTDIR)$(PREFIX)/bin
+DATADIR = $(DESTDIR)$(PREFIX)/share/blogtk
+APPLICATIONSDIR = $(DESTDIR)$(PREFIX)/share/applications
+ICONDIR = $(DESTDIR)$(PREFIX)/share/pixmaps
 
 PYFILES := $(shell $(FIND) . -name "*.py" -print)
 
@@ -28,7 +28,5 @@
 	$(INSTALL) -m 644 data/blogtk-icon.svgz $(ICONDIR)
 	$(INSTALL) -m 644 data/blogtk.desktop $(APPLICATIONSDIR)
 
-	if test -f /usr/bin/BloGTK; then rm /usr/bin/BloGTK; fi	
-
-	ln -s $(LIBDIR)/BloGTK.py $(BINDIR)/BloGTK
+	ln -sf $(PREFIX)/lib/blogtk/BloGTK.py $(BINDIR)/BloGTK
 	chmod +x $(BINDIR)/BloGTK