Index: configure.sh
===================================================================
--- configure.sh	(revision 2325)
+++ configure.sh	(working copy)
@@ -220,15 +220,15 @@
 	echo " * System version with prefix: $prefix"
 
 	echo "PREFIX=$prefix" >> config.make
-	echo "BIN=\$(DESTDIR)\$(PREFIX)/bin/" >> config.make 
-	echo "DATAPATH=\$(DESTDIR)\$(PREFIX)/share/instead" >> config.make
+	echo "BIN=\$(PREFIX)/bin/" >> config.make 
+	echo "DATAPATH=\$(PREFIX)/share/instead" >> config.make
 	echo "STEADPATH=\$(DATAPATH)/stead" >> config.make
 	echo "THEMESPATH=\$(DATAPATH)/themes" >> config.make
 	echo "GAMESPATH=\$(DATAPATH)/games" >> config.make
-	echo "ICONPATH=\$(DESTDIR)\$(PREFIX)/share/pixmaps" >> config.make
-	echo "DOCPATH=\$(DESTDIR)\$(PREFIX)/share/doc/instead" >> config.make
+	echo "ICONPATH=\$(PREFIX)/share/pixmaps" >> config.make
+	echo "DOCPATH=\$(PREFIX)/share/doc/instead" >> config.make
 	echo "LANGPATH=\$(DATAPATH)/lang" >> config.make
-	echo "MANPATH=\$(DESTDIR)\$(PREFIX)/share/man/man6" >> config.make
+	echo "MANPATH=\$(PREFIX)/share/man/man6" >> config.make
 
 	echo "Ok. We are ready to build and install. Use these commands:"
 	echo "    \$ make"
Index: doc/Makefile
===================================================================
--- doc/Makefile	(revision 2325)
+++ doc/Makefile	(working copy)
@@ -22,12 +22,12 @@
 docs:	wiki man pdf
 
 install:
-	$(INSTALLD) $(DOCPATH)
-	$(INSTALL) *.txt *.html *.pdf $(DOCPATH)
+	$(INSTALLD) $(DESTDIR)$(DOCPATH)
+	$(INSTALL) *.txt *.html *.pdf $(DESTDIR)$(DOCPATH)
 
-	$(INSTALLD) $(MANPATH)
-	$(INSTALL) *.6 $(MANPATH)
+	$(INSTALLD) $(DESTDIR)$(MANPATH)
+	$(INSTALL) *.6 $(DESTDIR)$(MANPATH)
 
 uninstall:
-	$(RM) -rf $(DOCPATH)
-	$(RM) $(MANPATH)/instead.*
+	$(RM) -rf $(DESTDIR)$(DOCPATH)
+	$(RM) $(DESTDIR)$(MANPATH)/instead.*
Index: games/Makefile
===================================================================
--- games/Makefile	(revision 2325)
+++ games/Makefile	(working copy)
@@ -3,15 +3,15 @@
 
 all:
 install:
-	$(INSTALLD) $(GAMESPATH)
+	$(INSTALLD) $(DESTDIR)$(GAMESPATH)
 	for f in *; do \
 		echo $$f;\
 		if [ ! -d $$f ]; then continue; fi;\
-		$(INSTALLD) $(GAMESPATH)/$$f; \
-		tar --exclude=".svn" -cf - -C $$f . | tar -xpf - -C $(GAMESPATH)/$$f;\
+		$(INSTALLD) $(DESTDIR)$(GAMESPATH)/$$f; \
+		tar --exclude=".svn" -cf - -C $$f . | tar -xpf - -C $(DESTDIR)$(GAMESPATH)/$$f;\
 	done
 
 uninstall:
-	$(RM) -rf $(GAMESPATH)
+	$(RM) -rf $(DESTDIR)$(GAMESPATH)
 
 clean:
Index: icon/Makefile
===================================================================
--- icon/Makefile	(revision 2325)
+++ icon/Makefile	(working copy)
@@ -4,16 +4,16 @@
 clean:
 all:
 install:
-	$(INSTALLD) $(ICONPATH)
-	$(INSTALL) sdl_instead.png $(ICONPATH)
+	$(INSTALLD) $(DESTDIR)$(ICONPATH)
+	$(INSTALL) sdl_instead.png $(DESTDIR)$(ICONPATH)
 ifeq ($(WINDOWS), yes)
-	$(INSTALL) sdl_instead_1x32.png $(ICONPATH)/sdl_instead_1.png
+	$(INSTALL) sdl_instead_1x32.png $(DESTDIR)$(ICONPATH)/sdl_instead_1.png
 else
-	$(INSTALL) sdl_instead_1.png $(ICONPATH)
+	$(INSTALL) sdl_instead_1.png $(DESTDIR)$(ICONPATH)
 endif
-	$(INSTALL) sdl_instead.ico $(ICONPATH)
+	$(INSTALL) sdl_instead.ico $(DESTDIR)$(ICONPATH)
 
 uninstall:
-	$(RM) $(ICONPATH)/sdl_instead.png
-	$(RM) $(ICONPATH)/sdl_instead_1.png
-	$(RM) $(ICONPATH)/sdl_instead.ico
+	$(RM) $(DESTDIR)$(ICONPATH)/sdl_instead.png
+	$(RM) $(DESTDIR)$(ICONPATH)/sdl_instead_1.png
+	$(RM) $(DESTDIR)$(ICONPATH)/sdl_instead.ico
Index: lang/Makefile
===================================================================
--- lang/Makefile	(revision 2325)
+++ lang/Makefile	(working copy)
@@ -4,11 +4,11 @@
 clean:
 all:
 install:
-	$(INSTALLD) $(LANGPATH)
+	$(INSTALLD) $(DESTDIR)$(LANGPATH)
 	for f in *.ini; do \
-		$(INSTALL) $$f $(LANGPATH)/$$f;\
+		$(INSTALL) $$f $(DESTDIR)$(LANGPATH)/$$f;\
 	done
 
 uninstall:
-	$(RM) -rf $(LANGPATH)
+	$(RM) -rf $(DESTDIR)$(LANGPATH)
 
Index: src/instead/Makefile
===================================================================
--- src/instead/Makefile	(revision 2325)
+++ src/instead/Makefile	(working copy)
@@ -8,9 +8,9 @@
 clean:
 	$(RM) -rf *.o instead
 install:
-	$(INSTALLD) $(BIN)
-	$(INSTALLB) instead $(BIN)/instead
+	$(INSTALLD) $(DESTDIR)$(BIN)
+	$(INSTALLB) instead $(DESTDIR)$(BIN)/instead
 
 uninstall:
-	$(RM) $(BIN)/instead
+	$(RM) $(DESTDIR)$(BIN)/instead
 
Index: src/sdl-instead/Makefile
===================================================================
--- src/sdl-instead/Makefile	(revision 2325)
+++ src/sdl-instead/Makefile	(working copy)
@@ -20,13 +20,13 @@
 	$(CC) $(CFLAGS) $(^) $(LDFLAGS) -o $(@) 
 
 install:
-	$(INSTALLD) $(BIN)
-	$(INSTALLB) sdl-instead$(EXE) $(BIN)/sdl-instead$(EXE)
-	$(LN) sdl-instead$(EXE) $(BIN)/instead$(EXE)
+	$(INSTALLD) $(DESTDIR)$(BIN)
+	$(INSTALLB) sdl-instead$(EXE) $(DESTDIR)$(BIN)/sdl-instead$(EXE)
+	$(LN) sdl-instead$(EXE) $(DESTDIR)$(BIN)/instead$(EXE)
 
 uninstall:
-	$(RM) $(BIN)/sdl-instead$(EXE)
-	$(RM) $(BIN)/instead$(EXE)
+	$(RM) $(DESTDIR)$(BIN)/sdl-instead$(EXE)
+	$(RM) $(DESTDIR)$(BIN)/instead$(EXE)
 
 clean:
 	$(RM) -f *.o sdl-instead$(EXE)
Index: stead/Makefile
===================================================================
--- stead/Makefile	(revision 2325)
+++ stead/Makefile	(working copy)
@@ -5,37 +5,37 @@
 all:	stead.lua
 
 install:
-	$(INSTALLD) $(STEADPATH) 
-	$(INSTALL) stead.lua $(STEADPATH)/stead.lua
-	$(INSTALL) gui.lua $(STEADPATH)/gui.lua
-	$(INSTALL) walk.lua $(STEADPATH)/walk.lua
-	$(INSTALL) xact.lua $(STEADPATH)/xact.lua
-	$(INSTALL) input.lua $(STEADPATH)/input.lua
-	$(INSTALL) click.lua $(STEADPATH)/click.lua
-	$(INSTALL) dbg.lua $(STEADPATH)/dbg.lua
-	$(INSTALL) vars.lua $(STEADPATH)/vars.lua
-	$(INSTALL) prefs.lua $(STEADPATH)/prefs.lua
-	$(INSTALL) snapshots.lua $(STEADPATH)/snapshots.lua
-	$(INSTALL) object.lua $(STEADPATH)/object.lua
-	$(INSTALL) format.lua $(STEADPATH)/format.lua
-	$(INSTALL) dash.lua $(STEADPATH)/dash.lua
-	$(INSTALL) para.lua $(STEADPATH)/para.lua
-	$(INSTALL) quotes.lua $(STEADPATH)/quotes.lua
-	$(INSTALL) timer.lua $(STEADPATH)/timer.lua
-	$(INSTALL) kbd.lua $(STEADPATH)/kbd.lua
-	$(INSTALL) hotkeys.lua $(STEADPATH)/hotkeys.lua
-	$(INSTALL) hideinv.lua $(STEADPATH)/hideinv.lua
-	$(INSTALL) theme.lua $(STEADPATH)/theme.lua
-	$(INSTALL) sprites.lua $(STEADPATH)/sprites.lua
-	$(INSTALL) sound.lua $(STEADPATH)/sound.lua
-	$(INSTALL) wroom.lua $(STEADPATH)/wroom.lua
-	$(INSTALL) nouse.lua $(STEADPATH)/nouse.lua
-	$(INSTALL) dlg.lua $(STEADPATH)/dlg.lua
-	$(INSTALL) counters.lua $(STEADPATH)/counters.lua
-	$(INSTALL) proxymenu.lua $(STEADPATH)/proxymenu.lua
-	$(INSTALL) nolife.lua $(STEADPATH)/nolife.lua
+	$(INSTALLD) $(DESTDIR)$(STEADPATH)
+	$(INSTALL) stead.lua $(DESTDIR)$(STEADPATH)/stead.lua
+	$(INSTALL) gui.lua $(DESTDIR)$(STEADPATH)/gui.lua
+	$(INSTALL) walk.lua $(DESTDIR)$(STEADPATH)/walk.lua
+	$(INSTALL) xact.lua $(DESTDIR)$(STEADPATH)/xact.lua
+	$(INSTALL) input.lua $(DESTDIR)$(STEADPATH)/input.lua
+	$(INSTALL) click.lua $(DESTDIR)$(STEADPATH)/click.lua
+	$(INSTALL) dbg.lua $(DESTDIR)$(STEADPATH)/dbg.lua
+	$(INSTALL) vars.lua $(DESTDIR)$(STEADPATH)/vars.lua
+	$(INSTALL) prefs.lua $(DESTDIR)$(STEADPATH)/prefs.lua
+	$(INSTALL) snapshots.lua $(DESTDIR)$(STEADPATH)/snapshots.lua
+	$(INSTALL) object.lua $(DESTDIR)$(STEADPATH)/object.lua
+	$(INSTALL) format.lua $(DESTDIR)$(STEADPATH)/format.lua
+	$(INSTALL) dash.lua $(DESTDIR)$(STEADPATH)/dash.lua
+	$(INSTALL) para.lua $(DESTDIR)$(STEADPATH)/para.lua
+	$(INSTALL) quotes.lua $(DESTDIR)$(STEADPATH)/quotes.lua
+	$(INSTALL) timer.lua $(DESTDIR)$(STEADPATH)/timer.lua
+	$(INSTALL) kbd.lua $(DESTDIR)$(STEADPATH)/kbd.lua
+	$(INSTALL) hotkeys.lua $(DESTDIR)$(STEADPATH)/hotkeys.lua
+	$(INSTALL) hideinv.lua $(DESTDIR)$(STEADPATH)/hideinv.lua
+	$(INSTALL) theme.lua $(DESTDIR)$(STEADPATH)/theme.lua
+	$(INSTALL) sprites.lua $(DESTDIR)$(STEADPATH)/sprites.lua
+	$(INSTALL) sound.lua $(DESTDIR)$(STEADPATH)/sound.lua
+	$(INSTALL) wroom.lua $(DESTDIR)$(STEADPATH)/wroom.lua
+	$(INSTALL) nouse.lua $(DESTDIR)$(STEADPATH)/nouse.lua
+	$(INSTALL) dlg.lua $(DESTDIR)$(STEADPATH)/dlg.lua
+	$(INSTALL) counters.lua $(DESTDIR)$(STEADPATH)/counters.lua
+	$(INSTALL) proxymenu.lua $(DESTDIR)$(STEADPATH)/proxymenu.lua
+	$(INSTALL) nolife.lua $(DESTDIR)$(STEADPATH)/nolife.lua
 
 uninstall:
-	$(RM) $(STEADPATH)/stead.lua
-	$(RM) $(STEADPATH)/gui.lua
+	$(RM) $(DESTDIR)$(STEADPATH)/stead.lua
+	$(RM) $(DESTDIR)$(STEADPATH)/gui.lua
 
Index: themes/Makefile
===================================================================
--- themes/Makefile	(revision 2325)
+++ themes/Makefile	(working copy)
@@ -4,13 +4,13 @@
 clean:
 all:
 install:
-	$(INSTALLD) $(THEMESPATH)
+	$(INSTALLD) $(DESTDIR)$(THEMESPATH)
 	for f in *; do \
 		if [ ! -d $$f ]; then continue; fi;\
-		$(INSTALLD) $(THEMESPATH)/$$f;\
-		tar --exclude=".svn" -cf - -C $$f . | tar -xpf - -C $(THEMESPATH)/$$f;\
+		$(INSTALLD) $(DESTDIR)$(THEMESPATH)/$$f;\
+		tar --exclude=".svn" -cf - -C $$f . | tar -xpf - -C $(DESTDIR)$(THEMESPATH)/$$f;\
 	done
 
 uninstall:
-	$(RM) -rf $(THEMESPATH)
+	$(RM) -rf $(DESTDIR)$(THEMESPATH)