summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorStepan Kasal2007-05-15 20:46:24 +0200
committerKarel Zak2007-05-16 11:43:30 +0200
commit15a9b48cf5a8e33e0f64070ca190c6eda586f8b8 (patch)
tree56f2318b1c907bc42012b801116e1d76ac443bdf /config
parentbuild-sys: set DISTCHECK_CONFIGURE_FLAGS in top-level makefile (diff)
downloadkernel-qcow2-util-linux-15a9b48cf5a8e33e0f64070ca190c6eda586f8b8.tar.gz
kernel-qcow2-util-linux-15a9b48cf5a8e33e0f64070ca190c6eda586f8b8.tar.xz
kernel-qcow2-util-linux-15a9b48cf5a8e33e0f64070ca190c6eda586f8b8.zip
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>
Diffstat (limited to 'config')
-rw-r--r--config/include-Makefile.am8
1 files changed, 3 insertions, 5 deletions
diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 6e306556f..eea8e256b 100644
--- 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)\"