From 40e29531a5d350f222620c6642b05cd8fa514ccf Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Fri, 15 Jul 2011 11:22:02 +0200 Subject: [PATCH] Revert "config-lib: change defaults of SYSCONFDIR/LOCALSTATEDIR when PREFIX != /usr{,/local}" This reverts commit d80fdf06487eda9fbe6cf1a167a30ba8d716a200. this does not work since builtin config is interpreted first and PREFIX can be overwritten later in bee-file. --- src/beelib.config.sh.in | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/beelib.config.sh.in b/src/beelib.config.sh.in index 11ffc88..1f35873 100644 --- a/src/beelib.config.sh.in +++ b/src/beelib.config.sh.in @@ -142,12 +142,6 @@ function config_verify_builtin_prefixes() { : ${BINDIR:='${EPREFIX}/bin'} : ${SBINDIR:='${EPREFIX}/sbin'} : ${LIBEXECDIR:='${EPREFIX}/lib/${PKGNAME}'} - - if [ "${PREFIX}" != "/usr" -a "${PREFIX}" != "/usr/local" ] ; then - : ${SYSCONFDIR:='${PREFIX}'/etc} - : ${LOCALSTATEDIR:='${PREFIX}'/var} - fi - : ${SYSCONFDIR:=/etc} : ${LOCALSTATEDIR:=/var} : ${SHAREDSTATEDIR:='${LOCALSTATEDIR}'}