shifted around paths

DATADIR/rc/bin => PREFIX/bin
DATADIR/rc/opt => DATADIR/bin
updated profile (bashstyle.sh)
updated configure
fixed bug #129 (wrong prefix when setup via debian/rules)
parent 4de1cac1
......@@ -18,7 +18,7 @@ export_result ()
echo -e "MODE=\"$MODE\"\
\nPREFIX=\"$PREFIX\"\
\nDATADIR=\"$PREFIX/share/bashstyle-ng/\"\
\nDATADIR_LIST=( ui data rc/{,ascii,bin,dirinfo,functions,generator,internal,opt,settings,styles,wizard} terminfo/{,b,m,n} vim/{,colors} )\
\nDATADIR_LIST=( bin ui data rc/{,ascii,dirinfo,functions,generator,internal,settings,styles,wizard} terminfo/{,b,m,n} vim/{,colors} )\
\nPROFILEDIR=\"/etc/profile.d/\"\
\nBINDIR=\"$PREFIX/bin\"\
\nLOCALEDIR=\"$PREFIX/share/locale/\"\
......
......@@ -27,8 +27,8 @@ DOC_FILES=( docs/*.html:${DOCDIR}
{AUTHORS,COPYING.CODE,COPYING.ICONS,CREDITS,NEWS,README}:${DOCDIR} )
BIN_FILES=( data/bashstyle:${BINDIR}
rc/bin/*:${DATADIR}/rc/bin
rc/opt/*:${DATADIR}/rc/opt )
bin/*:${BINDIR}
bin-extra/*:${DATADIR}/bin )
PROFILE_FILES=( data/bashstyle.sh:${PROFILEDIR} )
......
......@@ -16,7 +16,7 @@ while [[ $xcount -lt $pcount ]]; do
MODE=MAINTAINER
;;
*prefix* )
--prefix* )
PREFIX="${1/*=}"
;;
......
......@@ -12,9 +12,8 @@ export WANT_DIRINFO_FLAGS="@DIRINFO_ENABLE@"
export GAME_PATH="/usr/games:/usr/local/games"
export OLD_PATH="$PATH"
export BSNG_PATH="@PREFIX@/share/bashstyle-ng/rc/bin/"
export PATH="$BSNG_PATH:$OLD_PATH:$GAME_PATH:."
export PATH="$OLD_PATH:$GAME_PATH:."
if [[ ! $WANT_DIRINFO_FLAGS == "false" ]]; then
export CP_CMD=$(which cp)
......@@ -22,7 +21,9 @@ if [[ ! $WANT_DIRINFO_FLAGS == "false" ]]; then
export RM_CMD=$(which rm)
export SH_CMD=$(which shred)
export SH_OPTS="-uvz"
export PATH="@PREFIX@/share/bashstyle-ng/rc/opt/:$PATH"
export PATH="@PREFIX@/share/bashstyle-ng/bin/:$PATH"
fi
# work-around a bug in specific
# autoconf versions (...)
export CONFIG_SHELL="/bin/bash"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment