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>

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 2e4363f2aff5db87386bd517c54066da3c6de8f2..f00776958f2f951cb155eeedad8f59a58765d3c0 100644 (file)
--- 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 8c17f3476bfcb2857ccb699aef0a3fa8d5d74e05..6a870659a7e0a757221cc4f6c55725856dc5b79d 100644 (file)
--- 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