[librep] use /lib instead of /libexecdir

[Christopher Bratusek <chrisb src gnome org>]

commit b9c50b3aa33e8c9c53957c21718254331c66d1ce
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Sat Dec 5 18:24:13 2009 +0100

    use /lib instead of /libexecdir

 ChangeLog      |   11 +++++++++++
 configure.in   |    9 ++++-----
 debian/rules   |    2 +-
 librep.pc.in   |    1 -
 librep.spec.in |    2 +-
 man/news.texi  |    4 ++++
 6 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3432852..e49c100 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-12-05  Christopher Bratusek <zanghar freenet de>
+	* configure.in: bumped library version to 9.4.1
+
+	* configure.in
+	* librep.pc.in
+	* debian/rules
+	* librep.spec.in
+	* Makedefs.in: use $prefix/lib instead of $prefix/libexecdir to satisfy FHS
+
+	* man/news.texi: updated
+
 2009-11-13  Christopher Bratusek <zanghar freenet de>
 	* configure.in: post-release version-bump to 0.90.4
 
diff --git a/configure.in b/configure.in
index 00fb9e6..8cbb881 100644
--- a/configure.in
+++ b/configure.in
@@ -33,9 +33,9 @@ dnl libtool versioning info: `CURRENT:REVISION:AGE'. CURRENT is the
 dnl current interface id, REVISION is the version number of this
 dnl implementation, AGE defines the first interface id also supported
 dnl (i.e. all interfaces between CURRENT-AGE and CURRENT are supported)
-libcurrent=13
+libcurrent=14
 librevision=0
-libage=4
+libage=5
 libversion="$libcurrent:$librevision:$libage"
 
 makefile_template="Makefile.in:Makedefs.in"
@@ -58,8 +58,8 @@ esac
 
 repdir='${datadir}/rep'
 replispdir='${repdir}/${version}/lisp'
-repexecdir='${libexecdir}/rep/${version}/${host_type}'
-repcommonexecdir='${libexecdir}/rep/${host_type}'
+repexecdir='${libdir}/rep/${version}/${host_type}'
+repcommonexecdir='${libdir}/rep/${host_type}'
 repdocfile='${repexecdir}/doc-strings'
 
 emacssitelispdir='${datadir}/emacs/site-lisp'
@@ -651,7 +651,6 @@ echo "
   prefix:       $prefix
   exec_prefix:  $exec_prefix
   libdir:       $libdir
-  libexecdir:   $libexecdir
 
   == == == == == == == == == == == == ==
   
diff --git a/debian/rules b/debian/rules
index 3164da5..dd2dc7b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ configure-stamp: patch-stamp
 	cp /usr/share/libtool/config/config.guess .
 	cp /usr/share/libtool/config/config.sub .
 
-	./configure --prefix=/usr --libexecdir=/usr/lib --mandir=/usr/share/man \
+	./configure --prefix=/usr --mandir=/usr/share/man \
 	--build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
 	--with-readline CFLAGS="$(CFLAGS)" $(ARCH_CONF)
 
diff --git a/librep.pc.in b/librep.pc.in
index be9795f..03f601f 100644
--- a/librep.pc.in
+++ b/librep.pc.in
@@ -3,7 +3,6 @@ host_type= host@
 prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
-libexecdir= libexecdir@
 repexecdir= repexecdir@
 repcommonexecdir= repcommonexecdir@
 includedir= includedir@
diff --git a/librep.spec.in b/librep.spec.in
index 5ab26cc..b62f1f5 100644
--- a/librep.spec.in
+++ b/librep.spec.in
@@ -47,7 +47,7 @@ nicely interacts and integrates into emacs.
 
 %build
 
-%configure --with-readline --enable-shared --disable-rpath --libexecdir=%{_libdir}
+%configure --with-readline --enable-shared --disable-rpath
 make %{?_smp_mflags}
 
 %install
diff --git a/man/news.texi b/man/news.texi
index 3b1af40..7a006ed 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -7,6 +7,10 @@
 
 @itemize @bullet
 
+ item Library version bumped to 9.4.1
+
+ item Use $prefix/lib instead of $prefix/libexec
+
 @item Fixups for OpenBSD [Jasper Lievisse Adriaanse]
 @end itemize