[sawfish: 35/42] remove version from install paths

[Christopher Bratusek <chrisb src gnome org>]

commit 570a167140185cde0fdc9561453cd41b554ceef8
Author: Christopher Roy Bratusek <nano tuxfamily org>
Date:   Thu Apr 14 21:23:31 2011 +0200

    remove version from install paths

 Makefile.in        |    4 ++--
 configure.in       |    4 ++--
 sounds/Makefile.in |    5 ++---
 themes/Makefile.in |    5 ++---
 4 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/Makefile.in b/Makefile.in
index 93440d3..10cdfb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -58,7 +58,7 @@ install : all installdirs
 	fi
 
 installdirs : mkinstalldirs
-	$(SHELL) $< $(DESTDIR)$(sawfishdir)/$(version) \
+	$(SHELL) $< $(DESTDIR)$(sawfishdir) \
 	  $(DESTDIR)$(bindir) $(DESTDIR)$(sawfishexecdir) \
 	  $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties \
 	  $(DESTDIR)$(datadir)/applications/ \
@@ -70,7 +70,7 @@ uninstall :
 	for dir in $(SUBDIRS); do \
 	  ( cd $$dir && $(MAKE) $@ ) || exit 1; \
 	done
-	rm -rf $(DESTDIR)$(sawfishdir)/$(version)
+	rm -rf $(DESTDIR)$(sawfishdir)
 	rm -f $(DESTDIR)$(libdir)/pkgconfig/sawfish.pc
 	if test $(XDM_SESSION) = "yes"; then \
 		rm -f $(DESTDIR)$(datadir)/xsessions/sawfish.desktop; \
diff --git a/configure.in b/configure.in
index 55a0f07..5eeedbf 100644
--- a/configure.in
+++ b/configure.in
@@ -41,9 +41,9 @@ install_sh=../install-sh
 SUBDIRS="src lisp scripts themes sounds man"
 
 sawfishdir='${datadir}/sawfish'
-lispdir='${sawfishdir}/${version}/lisp'
+lispdir='${sawfishdir}/lisp'
 localedir='${datadir}/locale'
-sawfishexecdir='${libdir}/sawfish/${version}'
+sawfishexecdir='${libdir}/sawfish'
 
 dnl Several checks
 AC_C_CONST
diff --git a/sounds/Makefile.in b/sounds/Makefile.in
index a8d78c9..18328b0 100644
--- a/sounds/Makefile.in
+++ b/sounds/Makefile.in
@@ -26,8 +26,7 @@ top_srcdir= top_srcdir@
 srcdir= srcdir@
 VPATH= srcdir@:@top_srcdir@
 
-sitesoundsdir := ${sawfishdir}/sounds
-soundsdir := ${sawfishdir}/${version}/sounds
+soundsdir := ${sawfishdir}/sounds
 
 all :
 
@@ -37,7 +36,7 @@ install : all installdirs
 	done
 
 installdirs : mkinstalldirs
-	$(SHELL) $< $(DESTDIR)$(soundsdir) $(DESTDIR)$(sitesoundsdir)
+	$(SHELL) $< $(DESTDIR)$(soundsdir)
 
 uninstall :
 	rm -rf $(DESTDIR)$(soundsdir)
diff --git a/themes/Makefile.in b/themes/Makefile.in
index a665479..147c057 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -26,8 +26,7 @@ top_srcdir= top_srcdir@
 srcdir= srcdir@
 VPATH= srcdir@:@top_srcdir@
 
-sitethemedir := ${sawfishdir}/themes
-themedir := ${sawfishdir}/${version}/themes
+themedir := ${sawfishdir}/themes
 
 # also in lisp/Makefile.in
 sawfish_prog = $(rep_LIBTOOL) --mode=execute -dlopen ../src/gradient.la \
@@ -60,7 +59,7 @@ install : all installdirs
 	cd $(DESTDIR)$(themedir) && tar xf StyleTab.tar.gz && rm StyleTab.tar.gz
 
 installdirs : mkinstalldirs
-	$(SHELL) $< $(DESTDIR)$(themedir) $(DESTDIR)$(sitethemedir)
+	$(SHELL) $< $(DESTDIR)$(themedir)
 
 uninstall :
 	for d in $(THEMES); do \