shutils/install_funcs.sh: always remove unwanted perl installed files,

even in packages that use do_install(). Wrap a long line.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091015142511-d2m9zfpd18um4bm1
This commit is contained in:
Juan RP 2009-10-15 16:25:11 +02:00
parent 1febd85f42
commit c069ff4d49

View File

@ -1,5 +1,5 @@
#- #-
# Copyright (c) 2008 Juan Romero Pardines. # Copyright (c) 2008-2009 Juan Romero Pardines.
# All rights reserved. # All rights reserved.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -71,10 +71,15 @@ install_src_phase()
# Run post_install func. # Run post_install func.
run_func post_install || msg_error "post_install stage failed!" run_func post_install || msg_error "post_install stage failed!"
# Remove libtool archives from pkg destdir. # Remove libtool archives.
if [ -z "$libtool_no_delete_archives" ]; then if [ -z "$libtool_no_delete_archives" ]; then
find ${DESTDIR} -type f -name \*.la -delete find ${DESTDIR} -type f -name \*.la -delete
fi fi
# Always remove perllocal.pod and .packlist files.
if [ "$pkgname" != "perl" ]; then
find ${DESTDIR} -type f -name perllocal.pod -delete
find ${DESTDIR} -type f -name .packlist -delete
fi
# unset cross compiler vars. # unset cross compiler vars.
[ -n "$cross_compiler" ] && cross_compile_unsetvars [ -n "$cross_compiler" ] && cross_compile_unsetvars
@ -101,7 +106,7 @@ install_src_phase()
check_installed_pkg ${spkgrev} check_installed_pkg ${spkgrev}
[ $? -eq 0 ] && continue [ $? -eq 0 ] && continue
msg_normal "Preparing ${sourcepkg} subpackage: $sourcepkg-$subpkg" msg_normal "Preparing $sourcepkg subpackage: $sourcepkg-$subpkg"
if [ ! -f $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template ]; then if [ ! -f $XBPS_TEMPLATESDIR/$pkgname/$subpkg.template ]; then
msg_error "Cannot find subpackage template!" msg_error "Cannot find subpackage template!"
fi fi
@ -155,10 +160,6 @@ make_install()
fi fi
fi fi
# Always remove perllocal.pod and .packlist files.
find ${DESTDIR} -name perllocal.pod -delete
find ${DESTDIR} -name .packlist -delete
# Unset build vars. # Unset build vars.
unset_build_vars unset_build_vars
} }