From 15a9b48cf5a8e33e0f64070ca190c6eda586f8b8 Mon Sep 17 00:00:00 2001 From: Stepan Kasal Date: Tue, 15 May 2007 20:46:24 +0200 Subject: 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 --- config/include-Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'config') 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)\" -- cgit v1.2.3-55-g7522