diff --git a/shutils/install_funcs.sh b/shutils/install_funcs.sh index cd3ef6e3..8be8cd5a 100644 --- a/shutils/install_funcs.sh +++ b/shutils/install_funcs.sh @@ -1,5 +1,5 @@ #- -# Copyright (c) 2008 Juan Romero Pardines. +# Copyright (c) 2008-2009 Juan Romero Pardines. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -71,10 +71,15 @@ install_src_phase() # Run post_install func. 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 find ${DESTDIR} -type f -name \*.la -delete 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. [ -n "$cross_compiler" ] && cross_compile_unsetvars @@ -101,7 +106,7 @@ install_src_phase() check_installed_pkg ${spkgrev} [ $? -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 msg_error "Cannot find subpackage template!" fi @@ -155,10 +160,6 @@ make_install() 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 }