Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 102615 | Differences between
and this patch

Collapse All | Expand All

(-)sysinstall.in (-10 / +10 lines)
Lines 103-128 Link Here
103
    DESTDIR=`echo $SOURCE | sed -e "s,${prefix},,"`
103
    DESTDIR=`echo $SOURCE | sed -e "s,${prefix},,"`
104
    BINDIR=${SOURCE}/bin
104
    BINDIR=${SOURCE}/bin
105
else
105
else
106
    SCRIPTDIR=${DESTDIR}`echo @armascriptdir@ | sed -e "s,@prefix@,${PREFIX},"`
106
    SCRIPTDIR=`echo @armascriptdir@ | sed -e "s,@prefix@,${PREFIX},"`
107
    #@datasuffix@@scriptsuffix@
107
    #@datasuffix@@scriptsuffix@
108
    BINDIR=${DESTDIR}`echo @bindir@ | sed -e "s,@prefix@,${PREFIX},"`
108
    BINDIR=`echo @bindir@ | sed -e "s,@prefix@,${PREFIX},"`
109
fi
109
fi
110
110
111
# determine data locations
111
# determine data locations
112
EXECUTABLE=${BINDIR}/@progname@@executable_suffix@
112
EXECUTABLE=${DESTDIR}${BINDIR}/@progname@@executable_suffix@
113
CONFIGDIR=${SOURCE}`echo @configdir@ | sed -e "s,@prefix@,,"`
113
CONFIGDIR=`echo @configdir@ | sed -e "s,@prefix@,${PREFIX},"`
114
VARDIR=${SOURCE}`echo @vardir@ | sed -e "s,@prefix@,,"`
114
VARDIR=`echo @vardir@ | sed -e "s,@prefix@,${PREFIX},"`
115
115
116
# determine location of scripts
116
# determine location of scripts
117
117
118
test -d $SCRIPTDIR || { echo "Script directory not found."; exit -1; }
118
test -d $DESTDIR$SCRIPTDIR || { echo "Script directory not found."; exit -1; }
119
119
120
# transscribe true location into scripts
120
# transscribe true location into scripts
121
if test $MODE = install; then
121
if test $MODE = install; then
122
    echo "Transscribing scripts..."
122
    echo "Transscribing scripts..."
123
    for script in $SCRIPTDIR/*; do
123
    for script in $DESTDIR$SCRIPTDIR/*; do
124
        if test $script != $SCRIPTDIR/sysinstall; then
124
        if test $script != $DESTDIR$SCRIPTDIR/sysinstall; then
125
            sed -e "s,@configdir_reloc\@,$CONFIGDIR,g" -e "s,@prefix_reloc\@,$SOURCE,g" \
125
            sed -e "s,@configdir_reloc\@,$CONFIGDIR,g" -e "s,@prefix_reloc\@,$PREFIX,g" \
126
                -e "s,@scriptdir_reloc\@,$SCRIPTDIR,g" -e "s,@localstatedir_reloc\@,$VARDIR,g"\
126
                -e "s,@scriptdir_reloc\@,$SCRIPTDIR,g" -e "s,@localstatedir_reloc\@,$VARDIR,g"\
127
                < $script > $script.trans || exit -1
127
                < $script > $script.trans || exit -1
128
            mv $script.trans $script
128
            mv $script.trans $script
Lines 150-156 Link Here
150
fi
150
fi
151
151
152
# link executable files
152
# link executable files
153
pushd ${BINDIR} > /dev/null || exit -1
153
pushd ${DESTDIR}${BINDIR} > /dev/null || exit -1
154
install_link @progname@-@version@ @progname@
154
install_link @progname@-@version@ @progname@
155
install_link @prognamebase@-master-@version@ @prognamebase@-master
155
install_link @prognamebase@-master-@version@ @prognamebase@-master
156
popd > /dev/null 
156
popd > /dev/null 

Return to bug 102615