Skip to content

Commit

Permalink
Revert "config-lib: change defaults of SYSCONFDIR/LOCALSTATEDIR when …
Browse files Browse the repository at this point in the history
…PREFIX != /usr{,/local}"

This reverts commit d80fdf0.

this does not work since builtin config is interpreted first and PREFIX can be overwritten later in bee-file.
  • Loading branch information
mariux committed Jul 15, 2011
1 parent d80fdf0 commit 40e2953
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/beelib.config.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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}'}
Expand Down

0 comments on commit 40e2953

Please sign in to comment.