[sawfish] check installation path of sawfish-ksm.desktop via kde4-config

[Christopher Bratusek <chrisb src gnome org>]

commit 5f07f19344eba7e0f5f0f84645cb7d640d1f79a3
Author: chrisb <zanghar freenet de>
Date:   Fri Sep 11 16:03:31 2009 +0200

    check installation path of sawfish-ksm.desktop via kde4-config

 ChangeLog    |    5 +++++
 Makedefs.in  |    1 +
 Makefile.in  |    6 +++---
 configure.in |    8 ++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 0adf86d..0304d73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-11  Christopher Bratusek <zanghar freenet de>
+	* configure.in
+	* Makedefs.in
+	* Makefile.in: check for installation path of sawfish-ksm.desktop via kde4-config
+
 2009-09-08  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/wm/util/prompt.jl: squashed the last compiler warnings [Matthew Love]
 
diff --git a/Makedefs.in b/Makedefs.in
index f360c24..699af63 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -43,6 +43,7 @@ localedir= localedir@
 host_type= host@
 sawfishexecdir= sawfishexecdir@
 GNOMEDIR= GNOMEDIR@
+KDEDIR= KDEDIR@
 
 CC= CC@
 MAKEDEP= MAKEDEP@
diff --git a/Makefile.in b/Makefile.in
index 65aaf4a..e4d1832 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,7 +59,7 @@ install : all installdirs
 	done
 	$(INSTALL_DATA) $(top_srcdir)/sawfish.pc $(DESTDIR)$(libdir)/pkgconfig/
 	$(INSTALL_DATA) $(top_srcdir)/sawfish-session.desktop $(DESTDIR)$(datadir)/xsessions/sawfish.desktop
-	$(INSTALL_DATA) $(top_srcdir)/sawfish-ksm.desktop $(DESTDIR)$(datadir)/apps/ksmserver/windowmanagers/sawfish.desktop
+	$(INSTALL_DATA) $(top_srcdir)/sawfish-ksm.desktop $(DESTDIR)$(KDEDIR)/ksmserver/windowmanagers/sawfish.desktop
 
 installdirs : mkinstalldirs
 	$(SHELL) $< $(DESTDIR)$(sawfishdir)/$(version) \
@@ -68,7 +68,7 @@ installdirs : mkinstalldirs
 	  $(DESTDIR)$(datadir)/applications/ \
 	  $(DESTDIR)$(libdir)/pkgconfig/ \
 	  $(DESTDIR)$(datadir)/xsessions/ \
-	  $(DESTDIR)$(datadir)/apps/ksmserver/windowmanagers/
+	  $(DESTDIR)$(KDEDIR)/ksmserver/windowmanagers/
 
 uninstall :
 	for dir in $(SUBDIRS); do \
@@ -79,7 +79,7 @@ uninstall :
 	rm -f $(DESTDIR)$(datadir)/xsessions/sawfish.desktop
 	rm -f $(DESTDIR)$(datadir)/applications/sawfish.desktop
 	rm -f $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties/sawfish-wm.desktop
-	rm -f $(DESTDIR)$(datadir)/apps/ksmserver/windowmanagers/sawfish.desktop
+	rm -f $(DESTDIR)$(KDEDIR)/ksmserver/windowmanagers/sawfish.desktop
 
 DOC :
 	repdoc DOC `find $(srcdir) \( -name '*.c' -o -name '*.jl' \) -print`
diff --git a/configure.in b/configure.in
index c7112cd..21ec92d 100644
--- a/configure.in
+++ b/configure.in
@@ -361,6 +361,13 @@ if test $REP_MSGFMT = true; then
 fi
 AC_MSG_RESULT($LINGUAS)
 
+dnl install directory for sawfish-ksm.desktop
+KDEDIR="`kde4-config --path data | sed -e 's/.*://g'`"
+
+if test "x$KDEDIR" = x; then
+	KDEDIR="/usr/share/apps/"
+fi
+
 dnl Nonstandard exported symbols
 AC_SUBST(version)
 AC_SUBST(subversion)
@@ -372,6 +379,7 @@ AC_SUBST(install_sh)
 AC_SUBST(datarootdir)
 AC_SUBST(MAKEDEP)
 AC_SUBST(GNOMEDIR)
+AC_SUBST(KDEDIR)
 AC_SUBST(SUBDIRS)
 AC_SUBST(HAVE_X11)
 AC_SUBST(CPPFLAGS)