Solaris/buildpkg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move shortroot handling to the install stage. Automatically adding

Browse Source 
$prefix inside the stagedir when necessary.
This commit is contained in:
Tom G. Christensen 2004-11-27 13:17:41 +00:00
parent 80bb0c3785
commit 6776f58c74
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
buildpkg.functions
View File

@ -438,11 +438,7 @@ doc()
if [ ! -z $# ]; then if [ ! -z $# ]; then
setdir source setdir source
if [ "$shortroot" -eq 1 ]; then ddir=${stagedir}${prefix}/${_docdir}/${topdir}-${version}
ddir=$stagedir/$_docdir/$topdir-$version
else
ddir=$stagedir/$prefix/$_docdir/$topdir-$version
fi
${MKDIR} -p $ddir ${MKDIR} -p $ddir
echo "Adding docs" echo "Adding docs"
until [ -z "$1" ] until [ -z "$1" ]
@ -558,8 +554,12 @@ generic_build()
# params: $1 = destvar # params: $1 = destvar
# destvar is the variable that make should override to install into the staging # destvar is the variable that make should override to install into the staging
# area. default is DESTDIR, possible common alternatives are prefix and PREFIX # area. default is DESTDIR, possible common alternatives are prefix and PREFIX
# If shortroot=1 then we know that the install won't automatically create
# $prefix inside the stagedir so we have to do it first and add $prefix
# to the $destvar= argument
generic_install() generic_install()
{ {
local dest="$stagedir"
local destvar=DESTDIR local destvar=DESTDIR
local arg1=${1-'x'} local arg1=${1-'x'}
if [ "$arg1" != "x" ]; then if [ "$arg1" != "x" ]; then
@ -567,8 +567,12 @@ generic_install()
fi fi
if [ "$custom_install" -eq 0 ]; then if [ "$custom_install" -eq 0 ]; then
clean stage clean stage
if [ "$shortroot" -eq 1 ]; then
dest="${stagedir}${prefix}"
${MKDIR} -p "$dest"
fi
setdir source setdir source
$MAKE_PROG $destvar=$stagedir install $MAKE_PROG $destvar=$dest install
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
error $E_BAD_MAKE generic_install error $E_BAD_MAKE generic_install
fi fi
@ -582,7 +586,7 @@ generic_install()
# params: $1 - indicating whether or not the root is complete as described below # params: $1 - indicating whether or not the root is complete as described below
# We expect generic_install to have made $stagedir the "root" dir # We expect generic_install to have made $stagedir the "root" dir
# in that all paths below will be complete (ie. /usr/local/bin and not # in that all paths below will be complete (ie. /usr/local/bin and not
# just bin) *unless* $1=shortroot. # just bin).
# #
# This function should be implemented in the pr. packaging system # This function should be implemented in the pr. packaging system
# function library. # function library.