[sawfish] use instead of /libdir

[Christopher Bratusek <chrisb src gnome org>]

commit 08a70a92b056f6ccdba5c74640b21bfee7107c73
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Dec 5 18:29:14 2009 +0100

    use  instead of /libdir

 ChangeLog       |   10 ++++++++++
 Makedefs.in     |    1 -
 configure.in    |    5 ++---
 debian/rules    |    3 +--
 man/news.texi   |    4 +++-
 sawfish.pc.in   |    1 -
 sawfish.spec.in |    2 +-
 7 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1bb701d..c122a02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,16 @@
 			    entries to the session-menu are beeing added. If you're using
 			    KDE or GNOME then those are not generated.
 
+	* Makedefs.in
+	* configure.in
+	* debian/rules
+	* sawfish.pc.in
+	* sawfish.spec.in: use $prefix/lib instead of $prefix/libexecdir to satisfy FHS
+
+	* configure.in: minimum librep is now 0.90.4
+
+	* man/news.texi: updated
+
 2009-12-05  Teika Kazura <teika lavabit com>
 	* lisp/sawfish/wm/custom-defaults.jl
 	* lisp/sawfish/wm/ext/match-window.jl
diff --git a/Makedefs.in b/Makedefs.in
index 545e5da..da9a727 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -32,7 +32,6 @@ bindir= bindir@
 includedir= includedir@
 infodir= infodir@
 libdir= libdir@
-libexecdir= libexecdir@
 localstatedir= localstatedir@
 mandir= mandir@
 sharedstatedir= sharedstatedir@
diff --git a/configure.in b/configure.in
index 225bbd6..8913736 100644
--- a/configure.in
+++ b/configure.in
@@ -45,7 +45,7 @@ SUBDIRS="src lisp scripts themes sounds man"
 sawfishdir='${datadir}/sawfish'
 lispdir='${sawfishdir}/${version}/lisp'
 localedir='${datadir}/locale'
-sawfishexecdir='${libexecdir}/sawfish/${version}/${host_type}'
+sawfishexecdir='${libdir}/sawfish/${version}/${host_type}'
 
 dnl Several checks
 AC_C_CONST
@@ -204,7 +204,7 @@ else FONT_LOADER="X.Org"
 fi
 
 dnl Check for librep
-REP_MIN_VER="0.90.2"
+REP_MIN_VER="0.90.4"
 
 PKG_CHECK_MODULES(LIBREP, librep >= ${REP_MIN_VER}
 		  ,REP_EXECDIR="`pkg-config --variable=repcommonexecdir librep`"
@@ -443,7 +443,6 @@ echo "
   prefix:	$prefix
   exec_prefix:	$exec_prefix
   libdir:	$libdir
-  libexecdir:	$libexecdir
 
   == == == == == == == == == == == == ==
 
diff --git a/debian/rules b/debian/rules
index b4e642e..72d680f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,8 +38,7 @@ configure-stamp: $(QUILT_STAMPFN)
 	aclocal-1.10
 	autoconf
 
-	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-readline \
-	--libexecdir=/usr/lib $(confflags)
+	CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --with-readline $(confflags)
 
 # Get rid of rpath
 	set -e; \
diff --git a/man/news.texi b/man/news.texi
index 31acfab..80da618 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -18,7 +18,7 @@ they occurred between. For more detailed information see the
 
 @item New/Updated requirements:
 @itemize +
- item librep 0.90.0 -> 0.90.2
+ item librep 0.90.0 -> 0.90.4
 @item rep-gtk 0.18.4 -> 0.90.0
 @end itemize
 
@@ -165,6 +165,8 @@ Kozicki]
 @item Expand REP_ENVIRON in scripts/Makefile.in [Luis Rodrigo Gallardo Cruz]
 
 @item Add @code{--tag=CC} to libtool where necessary. It unbrakes compilation on some arches [Gentoo Linux]
+
+ item Use $prefix/lib instead of $prefix/libexecdir, to satify the FHS [Christopher Bratusek]
 @end itemize
 @item In configurator,
 
diff --git a/sawfish.pc.in b/sawfish.pc.in
index 05a181d..1eba46a 100644
--- a/sawfish.pc.in
+++ b/sawfish.pc.in
@@ -1,7 +1,6 @@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
-libexecdir= libexecdir@
 includedir= includedir@
 
 sawfishhosttype= host@
diff --git a/sawfish.spec.in b/sawfish.spec.in
index 331246e..ee0e2af 100644
--- a/sawfish.spec.in
+++ b/sawfish.spec.in
@@ -68,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/man/man1/sawfish*.gz
 %{_datadir}/pixmaps/sawfish*.png
 %{_libdir}/pkgconfig/sawfish.pc
-%{_libexecdir}/sawfish/%{version}/%{_host}
+%{_libdir}/sawfish/%{version}/%{_host}
 @REP_EXECDIR@/sawfish
 %{_infodir}/sawfish*