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

Make generic_build and generic_install able to descend into a subdir

Browse Source 
inside the sourcedir before doing their thing.
This commit is contained in:
Tom G. Christensen 2005-03-12 12:51:52 +00:00
parent 1719dd0aae
commit 274321e7fe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
buildpkg.functions
View File

@ -589,10 +589,10 @@ generic_prep()
} }
# generic_build(): Take the necessary steps to build already prepared source # generic_build(): Take the necessary steps to build already prepared source
# params: none # params: $1 = dir to descend to *inside* "source" - optional
generic_build() generic_build()
{ {
setdir source setdir ${srcdir}/${topsrcdir}/$1
./configure $(_upls $configure_args) ./configure $(_upls $configure_args)
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
@ -605,12 +605,13 @@ generic_build()
} }
# generic_install(): Install already built source # generic_install(): Install already built source
# params: $1 = destvar # params: $1 = destvar [$2 = dir to descend to *inside* "source"]
# 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 # 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 # $prefix inside the stagedir so we have to do it first and add $prefix
# to the $destvar= argument # to the $destvar= argument
# If $2 is specified then we will descend into that subdir before attempting the install
generic_install() generic_install()
{ {
local dest="$stagedir" local dest="$stagedir"
@ -625,7 +626,7 @@ generic_install()
dest="${stagedir}${prefix}" dest="${stagedir}${prefix}"
${MKDIR} -p "$dest" ${MKDIR} -p "$dest"
fi fi
setdir source setdir ${srcdir}/${topsrcdir}/$2
$MAKE_PROG $destvar=$dest 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