From 996fb3580f37a999abde9994d4244f8ea515de3d Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Tue, 30 Jun 2009 12:41:54 +0200
Subject: [PATCH] buildsys: move $usr{bin,sbin,lib}execdir definition to
 ./configure

We need to use $usr{bin,sbin,lib}execdir variables in *.pc.in files
and these files are generated by ./configure script.

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 config/include-Makefile.am |  5 -----
 configure.ac               | 12 ++++++++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 2e4363f2..f0077695 100644
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -1,8 +1,3 @@
-# The original default vaues of bindir and sbindir:
-usrbinexecdir = ${exec_prefix}/bin
-usrsbinexecdir = ${exec_prefix}/sbin
-usrlibexecdir = ${exec_prefix}/$(libdirname)
-
 AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
 	-DLOCALEDIR=\"$(localedir)\"
 AM_CFLAGS = -fsigned-char
diff --git a/configure.ac b/configure.ac
index 8c17f347..6a870659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,17 @@ case ${libdir} in
 esac
 AC_SUBST([libdirname])
 
+# The original default values of {bin,sbin,lib}dir
+usrbinexecdir='${exec_prefix}/bin'
+AC_SUBST([usrbinexecdir])
+
+usrsbinexecdir='${exec_prefix}/sbin'
+AC_SUBST([usrsbinexecdir])
+
+usrlibexecdir='${exec_prefix}/'$libdirname
+AC_SUBST([usrlibexecdir])
+
+
 AC_PROG_CC_STDC
 AC_GNU_SOURCE
 AC_CANONICAL_HOST
@@ -917,4 +928,5 @@ tests/Makefile
 text-utils/Makefile
 ])
 
+
 AC_OUTPUT
-- 
2.39.5