diff --git a/config.mk.sh b/config.mk.sh new file mode 100644 index 0000000..9471c95 --- /dev/null +++ b/config.mk.sh @@ -0,0 +1,7 @@ +# make.sh config +PREFIX=${PREFIX:-/} +USR=${USR:-"${PREFIX}usr/local"} + +BINDIR=${BINDIR:-"${DESTDIR}${USR}/bin"} +LOGDIR=${LOGDIR:-"/tmp/userrc"} +CONFIG=${CONFIG:-"/etc/userrc.conf"} diff --git a/make.sh b/make.sh index 03d4257..c663929 100755 --- a/make.sh +++ b/make.sh @@ -7,7 +7,7 @@ set_vars() { sed -r \ -e "s%@CONFIG@%${CONFIG}%" \ - -r "s%@LOGDIR@%${LOGDIR}%" + -e "s%@LOGDIR@%${LOGDIR}%" } do_tell() { @@ -17,7 +17,7 @@ do_tell() { # Targets target_userrc() { - declare target='userrc' + target='userrc' printf '%s\n' "Building $target..." set_vars < "$target".in > "$target" diff --git a/userrc.in b/userrc.in index 9dcf5e2..b094275 100644 --- a/userrc.in +++ b/userrc.in @@ -67,8 +67,8 @@ get_allowed_users() { } runtime_config() { - config='/etc/userrc.conf' - cfg_logdir='/tmp/userrc' + config='@CONFIG@' + cfg_logdir='@LOGDIR@' while (( $# )); do case "$1" in