Handle missing VARDIR

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2012-09-02 15:51:35 -07:00
parent c16dfc609d
commit b922177769
5 changed files with 10 additions and 0 deletions

View File

@ -167,6 +167,8 @@ fi
if [ -z "${VARLIB}" ]; then if [ -z "${VARLIB}" ]; then
VARLIB=${VARDIR} VARLIB=${VARDIR}
VARDIR='${VARLIB}/${PRODUCT}' VARDIR='${VARLIB}/${PRODUCT}'
elif [ -z "${VARDIR}" ]; then
VARDIR='${VARLIB}/${PRODUCT}'
fi fi
for var in SHAREDIR LIBEXECDIR PERLLIBDIR CONFDIR SBINDIR VARLIB VARDIR; do for var in SHAREDIR LIBEXECDIR PERLLIBDIR CONFDIR SBINDIR VARLIB VARDIR; do

View File

@ -78,6 +78,8 @@ esac
if [ -z "${VARLIB}" ]; then if [ -z "${VARLIB}" ]; then
VARLIB=${VARDIR} VARLIB=${VARDIR}
VARDIR=${VARLIB}/$g_program VARDIR=${VARLIB}/$g_program
elif [ -z "${VARDIR}" ]; then
VARDIR='${VARLIB}/${PRODUCT}'
fi fi
# #

View File

@ -163,6 +163,8 @@ fi
if [ -z "${VARLIB}" ]; then if [ -z "${VARLIB}" ]; then
VARLIB=${VARDIR} VARLIB=${VARDIR}
VARDIR='${VARLIB}/${PRODUCT}' VARDIR='${VARLIB}/${PRODUCT}'
elif [ -z "${VARDIR}" ]; then
VARDIR='${VARLIB}/${PRODUCT}'
fi fi
for var in SHAREDIR LIBEXECDIR CONFDIR SBINDIR VARLIB VARDIR; do for var in SHAREDIR LIBEXECDIR CONFDIR SBINDIR VARLIB VARDIR; do

View File

@ -174,6 +174,8 @@ fi
if [ -z "${VARLIB}" ]; then if [ -z "${VARLIB}" ]; then
VARLIB=${VARDIR} VARLIB=${VARDIR}
VARDIR='${VARLIB}/${PRODUCT}' VARDIR='${VARLIB}/${PRODUCT}'
elif [ -z "${VARDIR}" ]; then
VARDIR='${VARLIB}/${PRODUCT}'
fi fi
for var in SHAREDIR LIBEXECDIRDIRDIR CONFDIR SBINDIR VARLIB VARDIR; do for var in SHAREDIR LIBEXECDIRDIRDIR CONFDIR SBINDIR VARLIB VARDIR; do

View File

@ -196,6 +196,8 @@ fi
if [ -z "${VARLIB}" ]; then if [ -z "${VARLIB}" ]; then
VARLIB=${VARDIR} VARLIB=${VARDIR}
VARDIR='${VARLIB}/${PRODUCT}' VARDIR='${VARLIB}/${PRODUCT}'
elif [ -z "${VARDIR}" ]; then
VARDIR='${VARLIB}/${PRODUCT}'
fi fi
for var in SHAREDIR LIBEXECDIR PERLLIBDIR CONFDIR SBINDIR VARLIB VARDIR; do for var in SHAREDIR LIBEXECDIR PERLLIBDIR CONFDIR SBINDIR VARLIB VARDIR; do