diff -ru bluefish-0.9.orig/data/Makefile.in bluefish-0.9/data/Makefile.in
--- bluefish-0.9.orig/data/Makefile.in	2003-02-16 12:22:56.000000000 +0100
+++ bluefish-0.9/data/Makefile.in	2003-03-04 17:27:21.000000000 +0100
@@ -28,16 +28,12 @@
 all: $(DEFAULTFILES)
 
 install: all
-	$(INSTALL_DIR) $(pkgdatadir)
+	$(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)
 	@for file in $(DEFAULTFILES) ; do \
-		$(INSTALL_DATA) $$file $(pkgdatadir)/$$file ;\
+		$(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir)/$$file ;\
 	done
-	if [ -d /usr/share/applications ] ; then \
-		$(INSTALL_DATA) bluefish.desktop /usr/share/applications/ ;\
-	fi
-	if [ -d /usr/share/gnome/apps/Applications ] ; then \
-		$(INSTALL_DATA) bluefish.desktop /usr/share/gnome/apps/Applications ;\
-	fi
+	$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications
+	$(INSTALL_DATA) bluefish.desktop $(DESTDIR)$(datadir)/applications
 
 uninstall:
 	@for file in $(DEFAULTFILES) ; do \
diff -ru bluefish-0.9.orig/icons/Makefile.in bluefish-0.9/icons/Makefile.in
--- bluefish-0.9.orig/icons/Makefile.in	2002-12-27 23:42:52.000000000 +0100
+++ bluefish-0.9/icons/Makefile.in	2003-03-04 17:28:15.000000000 +0100
@@ -49,9 +49,9 @@
 bluefish:
 
 install: all
-	$(INSTALL_DIR) $(pkgdatadir)
+	$(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)
 	for file in $(OBJS) ; \
-		do $(INSTALL_DATA) $$file $(pkgdatadir) ; \
+		do $(INSTALL_DATA) $$file $(DESTDIR)$(pkgdatadir) ; \
 	done
 
 uninstall:
diff -ru bluefish-0.9.orig/Makefile.in bluefish-0.9/Makefile.in
--- bluefish-0.9.orig/Makefile.in	2003-02-16 12:16:29.000000000 +0100
+++ bluefish-0.9/Makefile.in	2003-03-04 17:25:57.000000000 +0100
@@ -30,7 +30,7 @@
 bindir=@bindir@
 datadir=@datadir@
 pkgdatadir=$(datadir)/$(PACKAGE)
-pixmapsdir=@prefix@/share/pixmaps
+pixmapsdir=$(datadir)/pixmaps
 
 INSTALL = @INSTALL@
 INSTALL_DIR = $(INSTALL) -d -m 755 
@@ -64,13 +64,11 @@
 	rm -f *.orig *.rej
 
 install: src/bluefish
-	pkgdatadir=@pkgdatadir@
-	$(INSTALL_DIR) $(pkgdatadir)
-	$(INSTALL_DATA) images/bluefish_splash.png $(pkgdatadir)
+	$(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)
+	$(INSTALL_DATA) images/bluefish_splash.png $(DESTDIR)$(pkgdatadir)
 	@cd icons/ && $(MAKE) install
-	if [ -d /usr/share/pixmaps ]; then \
-		$(INSTALL_DATA) inline_images/bluefish_icon1.png /usr/share/pixmaps/bluefish-icon.png ;\
-	fi
+	$(INSTALL_DIR) $(DESTDIR)$(pixmapsdir)
+	$(INSTALL_DATA) inline_images/bluefish_icon1.png $(DESTDIR)$(pixmapsdir)/bluefish-icon.png
 	@cd src/ && $(MAKE) install
 	@cd po/ && $(MAKE) install
 	@cd data/ && $(MAKE) install
diff -ru bluefish-0.9.orig/po/Makefile.in bluefish-0.9/po/Makefile.in
--- bluefish-0.9.orig/po/Makefile.in	2003-02-13 23:14:31.000000000 +0100
+++ bluefish-0.9/po/Makefile.in	2003-03-04 17:29:01.000000000 +0100
@@ -40,9 +40,9 @@
 install:
 	@for file in $(FINISHED_CATALOGS) ; do \
 		lang=`echo $${file} | sed -e 's/\.gmo$$//'`;\
-		$(INSTALL_DIR) $(localedir)/$${lang}/ ;\
-		$(INSTALL_DIR) $(localedir)/$${lang}/LC_MESSAGES/ ;\
-		$(INSTALL_DATA) $${lang}.gmo $(localedir)/$${lang}/LC_MESSAGES/${PACKAGE}.mo;\
+		$(INSTALL_DIR) $(DESTDIR)$(localedir)/$${lang}/ ;\
+		$(INSTALL_DIR) $(DESTDIR)$(localedir)/$${lang}/LC_MESSAGES/ ;\
+		$(INSTALL_DATA) $${lang}.gmo $(DESTDIR)$(localedir)/$${lang}/LC_MESSAGES/${PACKAGE}.mo;\
 	done
 
 uninstall:
diff -ru bluefish-0.9.orig/src/Makefile.in bluefish-0.9/src/Makefile.in
--- bluefish-0.9.orig/src/Makefile.in	2003-02-07 18:53:10.000000000 +0100
+++ bluefish-0.9/src/Makefile.in	2003-03-04 17:29:45.000000000 +0100
@@ -89,8 +89,8 @@
 	rm -f config.h Makefile *~ *.bak core
 
 install: all
-	$(INSTALL_DIR) $(bindir)
-	$(INSTALL_PROGRAM) ./bluefish $(bindir)/bluefish
+	$(INSTALL_DIR) $(DESTDIR)$(bindir)
+	$(INSTALL_PROGRAM) ./bluefish $(DESTDIR)$(bindir)/bluefish
 
 uninstall:
 	/bin/rm -f $(bindir)/bluefish