build-sys: --prefix defaults to /usr

Use prefix=/usr as the default setting.  If prefix is /usr, make
bindir and sbindir default to /bin and /sbin, respectively.

Signed-off-by: Stepan Kasal <skasal@redhat.com>

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 6e306556fe84925b3e269005a5d6431ffd6647aa..eea8e256bc6b682c8c5022f8826dbf8fc2b6d834 100644 (file)
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -1,8 +1,6 @@
-usrbinexecdir = $(prefix)/usr/bin
-usrsbinexecdir = $(prefix)/usr/sbin
-datadir = $(prefix)/usr/share
-infodir = $(datadir)/info
-mandir = $(datadir)/man
+# The original default vaues of bindir and sbindir:
+usrbinexecdir = ${exec_prefix}/bin
+usrsbinexecdir = ${exec_prefix}/sbin
 
 AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
        -DLOCALEDIR=\"$(localedir)\"

diff --git a/configure.ac b/configure.ac
index a457cc130de04a559b34a565bb3da3353fa1b58a..b9e5a90d02e0195bd81bc6658c9bfac16cd0e90e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,21 @@ AM_INIT_AUTOMAKE([check-news -Wall foreign 1.9])
 
 AC_CONFIG_SRCDIR(mount/mount.c)
 
-AC_PREFIX_DEFAULT(/)
+AC_PREFIX_DEFAULT([/usr])
+
+# Check whether exec_prefix=/usr:
+case $exec_prefix:$prefix in
+NONE:NONE | NONE:/usr | /usr:*)
+  AC_MSG_NOTICE([Default --exec-prefix detected.])
+  case $bindir in
+  '${exec_prefix}/bin') bindir=/bin
+    AC_MSG_NOTICE([  --bindir defaults to /bin]) ;;
+  esac
+  case $sbindir in
+  '${exec_prefix}/sbin') sbindir=/sbin
+    AC_MSG_NOTICE([  --sbindir defaults to /sbin]) ;;
+  esac ;;
+esac
 
 AC_PROG_CC_STDC
 AC_PROG_LIBTOOL