Do not set blindly 'prefix=...' in the install phase.
Rather if $make_install_prefix is not defined, use defaults. --HG-- extra : convert_revision : be83ac6eefe4dce25e82f7c57a9063dd77e5b049
This commit is contained in:
parent
ae3bc61f35
commit
b3f4a90070
1 changed files with 5 additions and 1 deletions
6
xbps.sh
6
xbps.sh
|
@ -256,6 +256,7 @@ reset_tmpl_vars()
|
|||
run_stuff_before_install_cmd run_stuff_after_install_cmd \
|
||||
make_install_target postinstall_helpers version \
|
||||
ignore_files tar_override_cmd xml_entries sgml_entries \
|
||||
make_install_prefix \
|
||||
XBPS_EXTRACT_DONE XBPS_CONFIGURE_DONE \
|
||||
XBPS_BUILD_DONE XBPS_INSTALL_DONE"
|
||||
|
||||
|
@ -835,11 +836,14 @@ install_src_phase()
|
|||
|
||||
echo "=> Running \`\`install´´ phase for: \`$pkgname-$version´."
|
||||
|
||||
[ -z "$make_install_prefix" ] && \
|
||||
make_install_prefix="prefix=\"$XBPS_DESTDIR/$pkgname-$version\""
|
||||
|
||||
#
|
||||
# Install package via make.
|
||||
#
|
||||
${make_cmd} ${make_install_args} ${make_install_target} \
|
||||
prefix="$XBPS_DESTDIR/$pkgname-$version"
|
||||
${make_install_prefix}
|
||||
if [ "$?" -ne 0 ]; then
|
||||
echo "*** ERROR instaling \`$pkgname-$version' ***"
|
||||
exit 1
|
||||
|
|
Loading…
Reference in a new issue