[sawfish/sawfish-1.7.0] fix installation for non-root-users (cherry-pick from HEAD)

[Christopher Bratusek <chrisb src gnome org>]

commit e0b299ff242b6f39fc5c80d85419791a14d68631
Author: Christopher Roy Bratusek <zanghar freenet de>
Date:   Thu Dec 9 22:40:12 2010 +0100

    fix installation for non-root-users
    (cherry-pick from HEAD)
    
    Conflicts:
    
    	ChangeLog

 ChangeLog                    |    7 +++++++
 configure.in                 |    2 +-
 lisp/sawfish/cfg/Makefile.in |    6 +++---
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index c492c6f..2a6858a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-09  Christopher Bratusek <zanghar freenet de>
+	* configure.in
+	* lisp/sawfish/cfg/Makefile.in: fix installation for non-root-users by
+	not hardcoding /usr for icons and kde4-prefix [Stefano Sabatini]
+
+	* configure.in:â??bump version to 1.7.1 (Chewing Drum)
+
 2010-10-23  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/menus.jl: fixed poweroff issue
 
diff --git a/configure.in b/configure.in
index c0cca25..ddc70a0 100644
--- a/configure.in
+++ b/configure.in
@@ -333,7 +333,7 @@ dnl install directory for sawfish-ksm.desktop
 KDEDIR="`kde4-config --install data`"
 
 if test "x$KDEDIR" = x; then
-	KDEDIR="/usr/share/kde4/apps/"
+	KDEDIR="${datadir}/kde4/apps/"
 fi
 
 gitdate=`date +%y%m%d`
diff --git a/lisp/sawfish/cfg/Makefile.in b/lisp/sawfish/cfg/Makefile.in
index 7d93a1f..ec43141 100644
--- a/lisp/sawfish/cfg/Makefile.in
+++ b/lisp/sawfish/cfg/Makefile.in
@@ -79,18 +79,18 @@ install : all installdirs
 	  $(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/cfg/layouts; \
 	done
 	$(INSTALL_SCRIPT) main.jlc $(DESTDIR)${bindir}/sawfish-config
-	$(INSTALL_DATA) sawfish-config.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/
+	$(INSTALL_DATA) sawfish-config.png $(DESTDIR)${datadir}/icons/hicolor/32x32/apps/
 
 uninstall :
 	rm -rf $(DESTDIR)${lispdir}/sawfish/cfg
-	rm -f $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/sawfish-config.png
+	rm -f $(DESTDIR)${datadir}/icons/hicolor/32x32/apps/sawfish-config.png
 	rm -f $(DESTDIR)${bindir}/sawfish-config
 
 installdirs : $(top_srcdir)/mkinstalldirs
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)/sawfish/cfg \
 	  $(DESTDIR)$(lispdir)/sawfish/cfg/widgets \
 	  $(DESTDIR)$(lispdir)/sawfish/cfg/layouts $(DESTDIR)$(bindir) \
-	  $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/
+	  $(DESTDIR)${datadir}/icons/hicolor/32x32/apps/
 
 clean : 
 	rm -f *.jlc *~ core