Install all packages via DESTDIR var and not prefix.
This removes many assignments that were needed before, and fixes some packages to install its manpage/info files. --HG-- extra : convert_revision : 5422f921ef81d089ed95ce0c52e5106ea10b2165
This commit is contained in:
@@ -55,9 +55,7 @@ build_src_phase()
|
||||
|
||||
[ -z "$make_cmd" ] && make_cmd=/usr/bin/make
|
||||
|
||||
#
|
||||
# Run pre_build helpers.
|
||||
#
|
||||
# Run pre_build func.
|
||||
run_func pre_build
|
||||
|
||||
[ -n "$XBPS_MAKEJOBS" -a -z "$disable_parallel_build" ] && \
|
||||
@@ -79,12 +77,10 @@ build_src_phase()
|
||||
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
|
||||
[ $? -ne 0 ] && msg_error "building $pkg (build phase)."
|
||||
|
||||
unset makejobs
|
||||
# Run post_build func.
|
||||
run_func post_build
|
||||
|
||||
#
|
||||
# Run pre_install helpers.
|
||||
#
|
||||
run_func pre_install
|
||||
unset makejobs
|
||||
|
||||
if [ -z "$in_chroot" ]; then
|
||||
if [ -z "$libtool_fixup_la_stage" \
|
||||
|
||||
@@ -56,7 +56,7 @@ configure_src_phase()
|
||||
cross_compile_setvars
|
||||
fi
|
||||
|
||||
# Run pre_configure helpers.
|
||||
# Run pre_configure func.
|
||||
run_func pre_configure
|
||||
|
||||
# Export configure_env vars.
|
||||
@@ -77,16 +77,10 @@ configure_src_phase()
|
||||
# Packages using GNU autoconf
|
||||
#
|
||||
if [ "$build_style" = "gnu_configure" ]; then
|
||||
if [ -z "$in_chroot" ]; then
|
||||
infodir=${DESTDIR}/usr/share/info
|
||||
mandir=${DESTDIR}/usr/share/man
|
||||
else
|
||||
infodir=/usr/share/info
|
||||
mandir=/usr/share/man
|
||||
fi
|
||||
${configure_script} \
|
||||
--prefix=/usr --sysconfdir=/etc \
|
||||
--infodir=${infodir} --mandir=${mandir} \
|
||||
--infodir=/usr/share/info \
|
||||
--mandir=/usr/share/man \
|
||||
${configure_args}
|
||||
#
|
||||
# Packages using propietary configure scripts.
|
||||
@@ -120,6 +114,9 @@ configure_src_phase()
|
||||
msg_error "building $pkg (configure phase)."
|
||||
fi
|
||||
|
||||
# Run post_configure func.
|
||||
run_func post_configure
|
||||
|
||||
# unset configure_env vars.
|
||||
for f in ${configure_env}; do
|
||||
unset eval ${f%=*}
|
||||
|
||||
@@ -48,6 +48,9 @@ install_src_phase()
|
||||
|
||||
cd $wrksrc || exit 1
|
||||
|
||||
# Run pre_install func.
|
||||
run_func pre_install
|
||||
|
||||
msg_normal "Running install phase for $pkgname-$version."
|
||||
|
||||
# cross compilation vars.
|
||||
@@ -62,9 +65,7 @@ install_src_phase()
|
||||
make_install
|
||||
fi
|
||||
|
||||
#
|
||||
# Run post_install helpers.
|
||||
#
|
||||
# Run post_install func.
|
||||
run_func post_install
|
||||
|
||||
# unset cross compiler vars.
|
||||
@@ -115,8 +116,7 @@ install_src_phase()
|
||||
make_install()
|
||||
{
|
||||
if [ -z "$make_install_target" ]; then
|
||||
make_install_target="install prefix=${DESTDIR}/usr"
|
||||
make_install_target="$make_install_target sysconfdir=${DESTDIR}/etc"
|
||||
make_install_target="DESTDIR=${DESTDIR} install"
|
||||
fi
|
||||
|
||||
[ -z "$make_cmd" ] && make_cmd=/usr/bin/make
|
||||
|
||||
@@ -63,7 +63,8 @@ reset_tmpl_vars()
|
||||
short_desc maintainer long_desc checksum wrksrc \
|
||||
patch_files make_cmd base_chroot register_shell \
|
||||
make_build_target configure_script \
|
||||
pre_configure pre_build pre_install post_install \
|
||||
pre_configure pre_build pre_install \
|
||||
post_configure post_build post_install \
|
||||
make_install_target version \
|
||||
xml_entries sgml_entries \
|
||||
build_depends libtool_fixup_la_stage no_fixup_libtool \
|
||||
|
||||
Reference in New Issue
Block a user